--- a/src/com/beem/project/beem/otr/BeemOtrManager.java	Tue Aug 23 02:25:54 2011 +0200
+++ b/src/com/beem/project/beem/otr/BeemOtrManager.java	Tue Aug 23 14:14:22 2011 +0200
@@ -130,7 +130,7 @@
     @Override
     public void injectMessage(SessionID sessionID, String msg) {
 	ChatAdapter chat = mChats.get(sessionID);
-	chat.sendMessage(msg);
+	chat.injectMessage(msg);
     }
 
     @Override

--- a/src/com/beem/project/beem/service/ChatAdapter.java	Tue Aug 23 02:25:54 2011 +0200
+++ b/src/com/beem/project/beem/service/ChatAdapter.java	Tue Aug 23 14:14:22 2011 +0200
@@ -113,7 +113,7 @@
      */
     @Override
     public void sendMessage(com.beem.project.beem.service.Message message) throws RemoteException {
-	sendMessage(message, true);
+	sendMessage(message, true, true);
     }
 
     /**
@@ -121,14 +121,14 @@
      * @param message the message to send
      * @param log do we want to log (in memory and history) the message?
      */
-    private void sendMessage(com.beem.project.beem.service.Message message, boolean log) {
+    private void sendMessage(com.beem.project.beem.service.Message message, boolean log, boolean otr) {
 	org.jivesoftware.smack.packet.Message send = new org.jivesoftware.smack.packet.Message();
 	String msgBody = message.getBody();
 	String otrBody = null;
 	send.setTo(message.getTo());
 	Log.w(TAG, "message to " + message.getTo());
 
-	if (mOtrSessionId != null) {
+	if (otr && mOtrSessionId != null) {
 
 	    try {
 		otrBody = BeemOtrManager.getInstance().getOtrManager().transformSending(mOtrSessionId, msgBody);
@@ -162,10 +162,10 @@
      * send message.
      * @param msg to send.
      */
-    public void sendMessage(String msg) {
+    public void injectMessage(String msg) {
 	Message msgToSend = new Message(mParticipant.getJIDWithRes(), Message.MSG_TYPE_CHAT);
 	msgToSend.setBody(msg);
-	sendMessage(msgToSend, false);
+	sendMessage(msgToSend, false, false);
     }
 
     /**