--- a/AndroidManifest.xml	Mon Jun 01 21:04:35 2009 +0200
+++ b/AndroidManifest.xml	Tue Jun 02 17:49:09 2009 +0200
@@ -14,10 +14,10 @@
 		</activity>
 		<activity android:name=".ui.ContactListSettings"
 			android:label="@string/app_name" />
-		<activity android:name=".ui.SendIM" android:label="@string/app_name" android:launchMode="singleTop" />
-		<activity android:name=".ui.ChangeStatus" android:label="@string/app_name" />
+		<activity android:name=".ui.SendIM" android:label="@string/SendIMActTitle" android:launchMode="singleTop" />
+		<activity android:name=".ui.ChangeStatus" android:label="@string/ChangeStatusActTitle" />
 		<activity android:name=".ui.AccountCreation" android:label="@string/app_name" />
-		<activity android:name=".ui.AddContact" android:label="@string/app_name" />
+		<activity android:name=".ui.AddContact" android:label="@string/AddCActTitle" />
 		<activity android:name=".ui.Subscription" android:label="@string/app_name" />
         <activity android:name=".ui.EditSettings" android:label="@string/edit_settings_name">
         </activity>

--- a/res/values/strings.xml	Mon Jun 01 21:04:35 2009 +0200
+++ b/res/values/strings.xml	Tue Jun 02 17:49:09 2009 +0200
@@ -69,6 +69,7 @@
 	<string name="ACCreated">Account created</string>
 	
 	<!-- AddContact class -->
+	<string name="AddCActTitle">Beem - Add contact</string>
 	<string name="AddCLogin">Login:</string>
 	<string name="AddCAlias">Alias:</string>
 	<string name="AddCGroup">Group:</string>
@@ -78,6 +79,7 @@
 	
 	<!--  SendIM class -->
 
+	<string name="SendIMActTitle">Beem - Chat</string>
 	<string name="SendIMSays"> %s says :\n</string>
 	<string name="SendIMYouSay">You say :\n</string>
 	<string name="SendIMToSendHint">Tip text here</string>
@@ -90,6 +92,7 @@
 	<!--  ChangeStatus class -->
 
 	<string name="ChangeStatusText">Type here your status message :</string>
+	<string name="ChangeStatusActTitle">Beem - Change status</string>
 
 	<string name="MenuAddContact">Add new contact</string>
 	<string name="MenuAccountAbout">Beem Project</string>

--- a/src/com/beem/project/beem/service/BeemChatManager.java	Mon Jun 01 21:04:35 2009 +0200
+++ b/src/com/beem/project/beem/service/BeemChatManager.java	Tue Jun 02 17:49:09 2009 +0200
@@ -113,7 +113,7 @@
 		    listener.processMessage(newchat, new com.beem.project.beem.service.Message(message));
 		}
 		mRemoteMessageListeners.finishBroadcast();
-		if (!newchat.isOpen()) {
+		if (!newchat.isOpen() && message.getBody() != null) {
 		    notifyNewChat(newchat);
 		}
 	    } catch (RemoteException e) {
@@ -147,10 +147,11 @@
 	    mRemoteMessageListeners.finishBroadcast();
 	}
     }
+
     /**
      * Tag to use with log methods.
      */
-    public static final String                       TAG                          = "BeemChatManager";
+    public static final String                             TAG                          = "BeemChatManager";
     private final ChatManager                              mAdaptee;
     private final Map<String, ChatAdapter>                 mChats                       = new HashMap<String, ChatAdapter>();
     private final ChatListener                             mChatListener                = new ChatListener();

--- a/src/com/beem/project/beem/ui/ContactDialog.java	Mon Jun 01 21:04:35 2009 +0200
+++ b/src/com/beem/project/beem/ui/ContactDialog.java	Tue Jun 02 17:49:09 2009 +0200
@@ -38,7 +38,7 @@
 	public void onClick(View v) {
 	    Activity a = ContactDialog.this.getOwnerActivity();
 	    Intent i = new Intent(mContext, SendIM.class);
-	    i.putExtra("contact", mContact);
+	    i.setData(mContact.toUri());
 	    a.startActivity(i);
 	    dismiss();
 	}
@@ -83,9 +83,9 @@
 
     public static final String TAG = "Option Dialog";
 
-    private Contact            mContact;
+    private final Contact      mContact;
 
-    private Context            mContext;
+    private final Context      mContext;
 
     private IXmppFacade        mService;
 

--- a/src/com/beem/project/beem/ui/SendIM.java	Mon Jun 01 21:04:35 2009 +0200
+++ b/src/com/beem/project/beem/ui/SendIM.java	Tue Jun 02 17:49:09 2009 +0200
@@ -265,10 +265,12 @@
 		    }
 		    switchChat(mContact);
 		} catch (RemoteException e) {
+
 		    Log.e(TAG, "Error during chat manager creation", e);
 		}
 	    }
 	});
+	mScrolling.fullScroll(ScrollView.FOCUS_DOWN);
     }
 
     /**