am 49488f81: Merge "DO NOT MERGE: Don\'t use multipart for SmartReply/Forward text" into honeycomb-mr2

* commit '49488f81811c3b9d59d4e275f074702e3907b899':
  DO NOT MERGE: Don't use multipart for SmartReply/Forward text
This commit is contained in:
Marc Blank 2011-06-03 09:41:21 -07:00 committed by Android Git Automerger
commit 079b628d4b

View File

@ -174,7 +174,11 @@ public class Rfc822Output {
} }
} }
messageBody[TEXT_BODY_IDX] = text; messageBody[TEXT_BODY_IDX] = text;
messageBody[HTML_BODY_IDX] = 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[HTML_BODY_IDX] = getHtmlAlternate(body, useSmartReply);
}
return messageBody; return messageBody;
} }