From 82df23dd41cf02c0f7e2ab367c22bfab0aad137c Mon Sep 17 00:00:00 2001
From: Moxie Marlinspike <moxie@thoughtcrime.org>
Date: Tue, 25 Feb 2014 17:38:55 -0800
Subject: [PATCH] Temporarily bring back end session.

---
 src/org/thoughtcrime/securesms/ConversationActivity.java | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/org/thoughtcrime/securesms/ConversationActivity.java b/src/org/thoughtcrime/securesms/ConversationActivity.java
index 4bc9c4109a..11fb1b0f00 100644
--- a/src/org/thoughtcrime/securesms/ConversationActivity.java
+++ b/src/org/thoughtcrime/securesms/ConversationActivity.java
@@ -270,9 +270,8 @@ public class ConversationActivity extends PassphraseRequiredSherlockFragmentActi
       } else {
         inflater.inflate(R.menu.conversation_secure_no_identity, menu);
       }
-      if (!pushRegistered) {
-        inflater.inflate(R.menu.conversation_secure_sms, menu.findItem(R.id.menu_security).getSubMenu());
-      }
+      
+      inflater.inflate(R.menu.conversation_secure_sms, menu.findItem(R.id.menu_security).getSubMenu());
     } else if (isSingleConversation() && !pushRegistered) {
       inflater.inflate(R.menu.conversation_insecure, menu);
     }