diff --git a/src/com/android/exchange/EasOutboxService.java b/src/com/android/exchange/EasOutboxService.java
index e9dc64828..de5cf490a 100644
--- a/src/com/android/exchange/EasOutboxService.java
+++ b/src/com/android/exchange/EasOutboxService.java
@@ -41,7 +41,6 @@ import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.IOException;
-import java.net.URLEncoder;
 
 public class EasOutboxService extends EasSyncService {
 
@@ -126,8 +125,7 @@ public class EasOutboxService extends EasSyncService {
             String cmd = "SendMail&SaveInSent=T";
             if (smartSend) {
                 cmd = reply ? "SmartReply" : "SmartForward";
-                cmd += "&ItemId=" + URLEncoder.encode(itemId, "UTF-8") + "&CollectionId="
-                    + URLEncoder.encode(collectionId, "UTF-8") + "&SaveInSent=T";
+                cmd += "&ItemId=" + itemId + "&CollectionId=" + collectionId + "&SaveInSent=T";
             }
             userLog("Send cmd: " + cmd);
             HttpResponse resp = sendHttpClientPost(cmd, inputEntity);
diff --git a/src/com/android/exchange/EasSyncService.java b/src/com/android/exchange/EasSyncService.java
index 32c0c0f5a..ea5611872 100644
--- a/src/com/android/exchange/EasSyncService.java
+++ b/src/com/android/exchange/EasSyncService.java
@@ -518,7 +518,9 @@ public class EasSyncService extends AbstractSyncService {
                 int code = resp.getStatusLine().getStatusCode();
                 userLog("OPTIONS response: ", code);
                 if (code == HttpStatus.SC_OK) {
-                    Header header = resp.getFirstHeader("ms-asprotocolversions");
+                    Header header = resp.getFirstHeader("MS-ASProtocolCommands");
+                    userLog(header.getValue());
+                    header = resp.getFirstHeader("ms-asprotocolversions");
                     String versions = header.getValue();
                     if (versions != null) {
                         if (versions.contains("12.0")) {