diff -r 5441ea00c4f1 -r 547bb144e3a4 res/menu/chat.xml
--- a/res/menu/chat.xml	Wed May 25 01:31:07 2011 +0200
+++ b/res/menu/chat.xml	Wed May 25 22:23:16 2011 +0200
@@ -7,14 +7,19 @@
 	</group>
 	<item android:id="@+id/chat_menu_close_chat" android:visible="true"
 		android:title="@string/chat_menu_close_chat" android:icon="@drawable/ic_menu_end_conversation" />
-	<item android:id="@+id/chat_menu_start_otr_session" android:visible="true"
-		android:title="@string/chat_menu_start_otr_session" />
-	<item android:id="@+id/chat_menu_listen_otr_session" android:visible="true"
-		android:title="@string/chat_menu_listen_otr_session" />
-	<item android:id="@+id/chat_menu_stop_otr_session" android:visible="true"
-		android:title="@string/chat_menu_stop_otr_session" />
-	<item android:id="@+id/chat_menu_otr_local_key" android:visible="true"
-		android:title="@string/chat_menu_otr_local_key" />
-	<item android:id="@+id/chat_menu_otr_remote_key" android:visible="true"
-		android:title="@string/chat_menu_otr_remote_key" />
+	<item android:id="@+id/chat_menu_otr_submenu" android:visible="true"
+		android:title="@string/chat_menu_otr_submenu">
+		<menu>
+			<item android:id="@+id/chat_menu_start_otr_session"
+				android:visible="true" android:title="@string/chat_menu_start_otr_session" />
+			<item android:id="@+id/chat_menu_listen_otr_session"
+				android:visible="true" android:title="@string/chat_menu_listen_otr_session" />
+			<item android:id="@+id/chat_menu_stop_otr_session"
+				android:visible="true" android:title="@string/chat_menu_stop_otr_session" />
+			<item android:id="@+id/chat_menu_otr_local_key" android:visible="true"
+				android:title="@string/chat_menu_otr_local_key" />
+			<item android:id="@+id/chat_menu_otr_remote_key"
+				android:visible="true" android:title="@string/chat_menu_otr_remote_key" />
+		</menu>
+	</item>
 </menu>