From 09a071a87938e0c1ed80962d54b6025618dca120 Mon Sep 17 00:00:00 2001
From: Marc Blank <mblank@google.com>
Date: Thu, 26 May 2011 10:18:24 -0700
Subject: [PATCH] Don't use multipart/alternative for SmartReply/Forward text

* When confirmed fixed, this should be backported to MR2/MR2

Bug: 4490341
Change-Id: Ie99047b465ed7087e6e0100f7d517ac3fb6b803c
---
 .../src/com/android/emailcommon/internet/Rfc822Output.java  | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/emailcommon/src/com/android/emailcommon/internet/Rfc822Output.java b/emailcommon/src/com/android/emailcommon/internet/Rfc822Output.java
index c9eb5893d..e03a92694 100644
--- a/emailcommon/src/com/android/emailcommon/internet/Rfc822Output.java
+++ b/emailcommon/src/com/android/emailcommon/internet/Rfc822Output.java
@@ -163,7 +163,11 @@ public class Rfc822Output {
             }
         }
         messageBody[INDEX_BODY_TEXT] = text;
-        messageBody[INDEX_BODY_HTML] = getHtmlAlternate(body, useSmartReply);
+        // Exchange 2003 doesn't seem to support multipart w/SmartReply and SmartForward, so
+        // we'll skip this.  Really, it would only matter if we could compose HTML replies
+        if (!useSmartReply) {
+            messageBody[INDEX_BODY_HTML] = getHtmlAlternate(body, useSmartReply);
+        }
         return messageBody;
     }