commit c6f1e2a8690bd3d4722a2e9386cdc98691135063
author Mindy Pereira <mindyp@google.com> Wed Apr 04 10:33:45 2012 -0700
committer Mindy Pereira <mindyp@google.com> Wed Apr 04 10:36:58 2012 -0700
tree 97fea37222d063732dfbc591e101fc665e73b85f
parent b6b174fb3a8f58a2c81e035917ebad8ab45b88ae

Make sure we put the contents of a message in the message.

This was just getting reply/replyall/fwd

Change-Id: I5bddf2d9fd52302b4193f566dab1f9176fd450c8

src/com/android/mail/compose/ComposeActivity.java

diff --git a/src/com/android/mail/compose/ComposeActivity.java b/src/com/android/mail/compose/ComposeActivity.java
index eb3f42a..6744fb8 100644
--- a/src/com/android/mail/compose/ComposeActivity.java
+++ b/src/com/android/mail/compose/ComposeActivity.java
@@ -1550,10 +1550,15 @@
                 break;
         }
         MessageModification.putDraftType(values, draftType);
-        if (refMessage != null && !TextUtils.isEmpty(refMessage.bodyHtml)) {
+        if (refMessage != null) {
+            if (!TextUtils.isEmpty(refMessage.bodyHtml)) {
+                MessageModification.putBodyHtml(values, fullBody.toString());
+            }
+            if (!TextUtils.isEmpty(refMessage.bodyText)) {
+                MessageModification.putBody(values, Html.fromHtml(fullBody.toString()).toString());
+            }
+        } else {
             MessageModification.putBodyHtml(values, fullBody.toString());
-        }
-        if (refMessage != null && !TextUtils.isEmpty(refMessage.bodyText)) {
             MessageModification.putBody(values, Html.fromHtml(fullBody.toString()).toString());
         }
         MessageModification.putAttachments(values, attachments);