--- a/src/com/beem/project/beem/ui/Chat.java	Tue Dec 07 22:57:56 2010 +0100
+++ b/src/com/beem/project/beem/ui/Chat.java	Wed Dec 08 21:43:17 2010 +0100
@@ -40,7 +40,7 @@
     Flavien Astraud, November 26, 2009
     Head of the EIP Laboratory.
 
-*/
+ */
 package com.beem.project.beem.ui;
 
 import java.text.DateFormat;
@@ -289,35 +289,47 @@
 		this.finish();
 		break;
 	    case R.id.chat_menu_start_otr_session:
-			try {
-				Log.d(TAG, "opened chats = " + mChat + " for "+mContact);
-				if (mChat == null) {
-					mChat = mChatManager.createChat(mContact, mMessageListener);
-					if (mChat != null) {
-					    mChat.setOpen(true);
-					}
-					
-				}
-			   mChat.startOtrSession();
-			} catch (RemoteException e) {
-			    Log.e(TAG, e.getMessage());
+		try {
+		    Log.d(TAG, "opened otr chats = " + mChat + " for "+mContact);
+		    if (mChat == null) {
+			mChat = mChatManager.createChat(mContact, mMessageListener);
+			if (mChat != null) {
+			    mChat.setOpen(true);
 			}
-			break;
+		    }
+		    mChat.startOtrSession();
+		} catch (RemoteException e) {
+		    Log.e(TAG, e.getMessage());
+		}
+		break;
+	    case R.id.chat_menu_listen_otr_session:
+		try {
+		    Log.d(TAG, "listen otr chats = " + mChat + " for "+mContact);
+		    if (mChat == null) {
+			mChat = mChatManager.createChat(mContact, mMessageListener);
+			if (mChat != null) {
+			    mChat.setOpen(true);
+			}
+		    }
+		    mChat.listenOtrSession();
+		} catch (RemoteException e) {
+		    Log.e(TAG, e.getMessage());
+		}
+		break;
 	    case R.id.chat_menu_stop_otr_session:
-			try {
-				Log.d(TAG, "opened chats = " + mChat + " for "+mContact);
-				if (mChat == null) {
-				    mChat = mChatManager.createChat(mContact, mMessageListener);
-					if (mChat != null) {
-					    mChat.setOpen(true);
-					}
-					
-				}
-			   mChat.endOtrSession();
-			} catch (RemoteException e) {
-			    Log.e(TAG, e.getMessage());
+		try {
+		    Log.d(TAG, "close otr chats = " + mChat + " for "+mContact);
+		    if (mChat == null) {
+			mChat = mChatManager.createChat(mContact, mMessageListener);
+			if (mChat != null) {
+			    mChat.setOpen(true);
 			}
-			break;
+		    }
+		    mChat.endOtrSession();
+		} catch (RemoteException e) {
+		    Log.e(TAG, e.getMessage());
+		}
+		break;
 	    default:
 		return false;
 	}
@@ -586,7 +598,7 @@
 		    mContactOtrState.setText(text);
 		}
 	    });
-		
+
 	}
     }