From 8794661433a1b68738e3d0138a4f5850cffc739c Mon Sep 17 00:00:00 2001
From: Jake McGinty <me@jake.su>
Date: Fri, 21 Feb 2014 19:05:18 -0800
Subject: [PATCH] fix "end session" inflation // FREEBIE

---
 res/menu/conversation_secure_sms.xml                 | 12 ++----------
 .../thoughtcrime/securesms/ConversationActivity.java |  2 +-
 2 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/res/menu/conversation_secure_sms.xml b/res/menu/conversation_secure_sms.xml
index be7768405..d30655c66 100644
--- a/res/menu/conversation_secure_sms.xml
+++ b/res/menu/conversation_secure_sms.xml
@@ -1,13 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:title="@string/conversation_secure_verified__menu_security"
-          android:id="@+id/menu_security"
-          android:icon="?menu_lock_icon"
-          android:showAsAction="ifRoom">
-          <menu>
-              <item android:title="@string/conversation_secure_verified__menu_abort_secure_session"
-                    android:id="@+id/menu_abort_session"/>
-
-          </menu>
-    </item>
+      <item android:title="@string/conversation_secure_verified__menu_abort_secure_session"
+            android:id="@+id/menu_abort_session"/>
 </menu>
\ No newline at end of file
diff --git a/src/org/thoughtcrime/securesms/ConversationActivity.java b/src/org/thoughtcrime/securesms/ConversationActivity.java
index ce74e0b9f..4c3692c6b 100644
--- a/src/org/thoughtcrime/securesms/ConversationActivity.java
+++ b/src/org/thoughtcrime/securesms/ConversationActivity.java
@@ -269,7 +269,7 @@ public class ConversationActivity extends PassphraseRequiredSherlockFragmentActi
         inflater.inflate(R.menu.conversation_secure_no_identity, menu);
       }
       if (!pushRegistered) {
-        inflater.inflate(R.menu.conversation_secure_sms, menu);
+        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);