From 1a16dbf2959a633cd1e2a8441272e3fd068f9c6a Mon Sep 17 00:00:00 2001
From: cketti <cketti@gmail.com>
Date: Thu, 23 Jan 2014 01:35:21 +0100
Subject: [PATCH] Restore instance state in correct order

Fixes issue 5968
---
 src/com/fsck/k9/activity/MessageCompose.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/com/fsck/k9/activity/MessageCompose.java b/src/com/fsck/k9/activity/MessageCompose.java
index 5bdd96877..3bf6e900d 100644
--- a/src/com/fsck/k9/activity/MessageCompose.java
+++ b/src/com/fsck/k9/activity/MessageCompose.java
@@ -1173,9 +1173,6 @@ public class MessageCompose extends K9Activity implements OnClickListener,
         // So compute the visibility of the "Add Cc/Bcc" menu item again.
         computeAddCcBccVisibility();
 
-        showOrHideQuotedText(
-                (QuotedTextMode) savedInstanceState.getSerializable(STATE_KEY_QUOTED_TEXT_MODE));
-
         mQuotedHtmlContent =
                 (InsertableHtmlContent) savedInstanceState.getSerializable(STATE_KEY_HTML_QUOTE);
         if (mQuotedHtmlContent != null && mQuotedHtmlContent.getQuotedContent() != null) {
@@ -1193,6 +1190,9 @@ public class MessageCompose extends K9Activity implements OnClickListener,
         mQuotedTextFormat = (SimpleMessageFormat) savedInstanceState.getSerializable(
                 STATE_KEY_QUOTED_TEXT_FORMAT);
 
+        showOrHideQuotedText(
+                (QuotedTextMode) savedInstanceState.getSerializable(STATE_KEY_QUOTED_TEXT_MODE));
+
         initializeCrypto();
         updateFrom();
         updateSignature();