diff --git a/k9mail/src/main/java/com/fsck/k9/ui/messageview/MessageContainerView.java b/k9mail/src/main/java/com/fsck/k9/ui/messageview/MessageContainerView.java
index 715525eb3..c233b06a3 100644
--- a/k9mail/src/main/java/com/fsck/k9/ui/messageview/MessageContainerView.java
+++ b/k9mail/src/main/java/com/fsck/k9/ui/messageview/MessageContainerView.java
@@ -421,10 +421,11 @@ public class MessageContainerView extends LinearLayout implements OnClickListene
             openPgpHeaderView.setOpenPgpData(messageViewContainer.signatureResult, messageViewContainer.encrypted,
                     messageViewContainer.pgpPendingIntent);
             openPgpHeaderView.setCallback(openPgpHeaderViewCallback);
+            mSidebar.setVisibility(View.VISIBLE);
+        } else {
+            mSidebar.setVisibility(View.GONE);
         }
 
-        mSidebar.setVisibility(View.VISIBLE);
-
         if (mText != null) {
             loadBodyFromText(mText);
         } else {