commit 764da398dc95239fab2822049eecb4423749b386
author Andy Huang <ath@google.com> Thu Nov 08 17:51:18 2012 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Thu Nov 08 17:51:19 2012 -0800
tree be7a4da5f543ce4df7db85bba8a1e82809866e8b
parent d4a4866c99ae0ed8c943b6c9ced1e7fbc987c639
parent 470aa42b2b33d3ec5cdffa967d47e7a7b4b7209a

Merge "fix "show pictures" button state after the view is recycled" into jb-ub-mail

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 e25b9f5..6bdaf2e 100644
--- a/src/com/android/mail/compose/ComposeActivity.java
+++ b/src/com/android/mail/compose/ComposeActivity.java
@@ -492,6 +492,13 @@
         initActionBar(action);
         initFromSpinner(savedInstanceState != null ? savedInstanceState : intent.getExtras(),
                 action);
+
+        // If this is a draft message, the draft account is whatever account was
+        // used to open the draft message in Compose.
+        if (mDraft != null) {
+            mDraftAccount = mReplyFromAccount;
+        }
+
         initChangeListeners();
         updateHideOrShowCcBcc();
         updateHideOrShowQuotedText(showQuotedText);