From 8bc984f4409549d477ffe44b5850f24827c42ef6 Mon Sep 17 00:00:00 2001
From: Jesse Vincent <jesse@fsck.com>
Date: Tue, 28 Dec 2010 09:11:35 +0000
Subject: [PATCH] APG-related messageview bugfixes

---
 src/com/fsck/k9/activity/MessageView.java | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/src/com/fsck/k9/activity/MessageView.java b/src/com/fsck/k9/activity/MessageView.java
index aee9655b0..073f5c065 100644
--- a/src/com/fsck/k9/activity/MessageView.java
+++ b/src/com/fsck/k9/activity/MessageView.java
@@ -751,6 +751,8 @@ public class MessageView extends K9Activity implements OnClickListener
             mMessageContentView.setVisibility(View.VISIBLE);
         }
 
+        setupDecryptLayout();
+
         setTitle("");
         Intent intent = getIntent();
         Uri uri = intent.getData();
@@ -815,13 +817,9 @@ public class MessageView extends K9Activity implements OnClickListener
             next.requestFocus();
         }
 
-
-        setupCryptoLayout();
         setupHeaderLayout();
         setupButtonViews();
 
-
-
         displayMessage(mMessageReference);
     }
 
@@ -938,7 +936,7 @@ public class MessageView extends K9Activity implements OnClickListener
         mAttachmentIcon.setVisibility(View.GONE);
     }
 
-    private void setupCryptoLayout()
+    private void setupDecryptLayout()
     {
         mDecryptLayout = (View) findViewById(R.id.layout_decrypt);
         mDecryptButton = (Button) findViewById(R.id.btn_decrypt);
@@ -1025,8 +1023,7 @@ public class MessageView extends K9Activity implements OnClickListener
     {
         super.onRestoreInstanceState(savedInstanceState);
         setLoadPictures(savedInstanceState.getBoolean(SHOW_PICTURES));
-        initializeCrypto((PgpData) savedInstanceState.getSerializable(STATE_PGP_DATA)
-                        );
+        initializeCrypto((PgpData) savedInstanceState.getSerializable(STATE_PGP_DATA));
         updateDecryptLayout();
     }