--- a/AndroidManifest.xml	Fri Oct 30 16:24:59 2009 +0100
+++ b/AndroidManifest.xml	Fri Oct 30 17:04:52 2009 +0100
@@ -28,6 +28,12 @@
 					android:name="com.beem.project.beem.service.XmppConnectionAdapter.CONNECTION_CLOSED" />
 			</intent-filter>
 		</activity>
+		<activity android:name=".ui.Chat" android:label="@string/chat_name"
+			android:launchMode="singleTop">
+			<intent-filter android:label="Beem Connection">
+				<action android:name="com.beem.project.beem.service.XmppConnectionAdapter.CONNECTION_CLOSED" />
+			</intent-filter>		
+		</activity>
 		<activity android:name=".ui.ChangeStatus" android:label="@string/ChangeStatusActTitle">
 			<intent-filter android:label="Beem Connection">
 				<action

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/res/layout/chat.xml	Fri Oct 30 17:04:52 2009 +0100
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+  xmlns:android="http://schemas.android.com/apk/res/android"
+  android:layout_width="wrap_content"
+  android:layout_height="wrap_content"
+  android:orientation="vertical">
+  <LinearLayout
+  	android:layout_width="fill_parent"
+  	android:layout_height="wrap_content">
+  	<ImageView android:id="@+id/chat_contact_status_icon"
+		android:adjustViewBounds="true" android:maxWidth="15dip"
+		android:maxHeight="12px" android:layout_width="wrap_content"
+		android:layout_height="wrap_content" android:gravity="center_vertical" />
+	<LinearLayout
+		android:orientation="vertical"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content">
+		<TextView android:id="@+id/chat_contact_name"
+			android:layout_width="fill_parent" android:layout_height="wrap_content"
+			android:lines="1" android:singleLine="true" android:paddingLeft="15sp"
+			android:textSize="14sp" android:textStyle="bold" android:textColor="#FFFFFF" />
+		<TextView android:id="@+id/chat_contact_status_msg"
+			android:layout_width="fill_parent" android:layout_height="wrap_content"
+			android:lines="1"
+			android:paddingLeft="15sp"
+			android:autoLink="all" android:textSize="12sp" android:textColor="#FFFFFF" />
+	</LinearLayout>
+  </LinearLayout>
+  <LinearLayout
+  	android:layout_width="fill_parent"
+  	android:layout_height="wrap_content">
+  </LinearLayout>
+  <LinearLayout
+  	android:layout_width="fill_parent"
+  	android:layout_height="wrap_content">
+	<EditText android:id="@+id/chat_input"
+		android:layout_width="fill_parent"
+		android:layout_height="wrap_content"
+		android:cursorVisible="false" android:hint="@string/chat_input_default_value" />
+  </LinearLayout>
+</LinearLayout>

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/res/values-en/strings.xml	Fri Oct 30 17:04:52 2009 +0100
@@ -0,0 +1,252 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+	<string name="app_name">Beem</string>
+	<string name="OkButton">Ok</string>
+	<string name="ClearButton">Clear</string>
+	<string name="CancelButton">Cancel</string>
+	<string name="AcceptButton">Accept</string>
+	<string name="RefuseButton">Refuse</string>
+
+	<!--  Beem class -->
+	<string name="BeemJabberID">Jabber ID</string>
+
+	<!--  BeemApplication class -->
+	<string name="BeemApplicationConnect">Connecting...</string>
+
+	<!--  BeemService class -->
+	<string name="BeemServiceDescription">Use Beem Service</string>
+	<string name="BeemServiceCreated">Beem Service Created</string>
+	<string name="BeemServiceDestroyed">Beem Service Destroyed</string>
+
+	<!--  Preferences informations -->
+	<string name="PreferenceStatus">Status</string>
+	<string name="PreferenceStatusText">status_text</string>
+	<string name="PreferenceIsConfigured">preference_is_configured
+	</string>
+
+	<!-- ContactListSettings class -->
+	<string name="CLSServerConnection">Server connection</string>
+	<string name="CLSUserid">User id:</string>
+	<string name="CLSPassword">Password:</string>
+	<string name="CLSService">Service:</string>
+	<string name="CLSHostPort">Port:</string>
+	<string name="CLSProxyInfo">Proxy informations</string>
+	<string name="CLSLogin">Login:</string>
+	<string name="CLSOkButton">Ok</string>
+
+	<!--  ContactDialog class -->
+	<string name="CDChat">Chat</string>
+	<string name="CDCall">Call</string>
+	<string name="CDInfos">Manage User</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>
+	<string name="AddCOkButton">Ok</string>
+	<string name="AddCContactAdded">Contact added</string>
+	<string name="AddCContactAddedError">Error Contact not added</string>
+	<string name="AddCContactAddedLoginError">Error Login</string>
+	<string name="AddCBadForm">Bad form</string>
+	<string name="AddCContactAlready">Contact already exist</string>
+
+	<!--  SendIM class -->
+	<string name="SendIMActTitle">Beem - Chat</string>
+
+	<string name="SendIMSays"> %s says :\n%s\n</string>
+	<string name="SendIMYouSay">You say :\n%s\n</string>
+	<string name="SendIMSameSpeaker">%s\n</string>
+	<string name="SendIMToSendHint">Tip text here</string>
+	<string name="SendIMState">Is : </string>
+	<string name="SendIMErrorMsg">Error : %s\n</string>
+	<string name="SendIMFrom">and is speaking from : </string>
+	<string name="SendIMSmiley">Insert a smiley</string>
+	<string name="SendIMLoginHint">login</string>
+	<string name="SendIMNoStatusSet">No status set</string>
+	
+	<!--  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>
+	<string name="MenuAccountCreate">Create account</string>
+	<string name="MenuConnection">Edit account</string>
+	<string name="ChangeStatusOk">Updating status</string>
+	<string name="ChangeStatusNoChange">Nothing to change</string>
+	
+	<!-- Settings class -->
+	<string name="SettingsText">Modify my username</string>
+	<string name="SettingsPassword">Modify my password</string>
+	<string name="SettingsCheckboxText">Using Gmail</string>
+	<string name="SettingsGmail">Use my Gmail account</string>
+	<string name="SettingsProxy">Proxy</string>
+	<string name="SettingsProxyProxy">Use a proxy server</string>
+	<string name="SettingsProxySummary">Check this box if you\'re behind a proxy server</string>
+	<string name="SettingsProxyType">Protocol</string>
+	<string name="SettingsProxyTypeSummary">Choose the proxy server type</string>
+	<string name="SettingsProxyServer">Address definition of the proxy server</string>
+	<string name="SettingsProxyPort">Port definition of the proxy server</string>
+	<string name="SettingsProxyUser">Optional, allow to authenticate yourself on the proxy server</string>
+	<string name="SettingsProxyPassword">Optional, allow to authenticate yourself on the proxy server</string>
+	<string name="SettingsAdvanced">Advanced</string>
+	<string name="SettingsAdvancedOptions">Use specific server option</string>
+	<string name="SettingsAdvancedRecoDelay">Modify reconnection delay</string>
+	<string name="SettingsAdvancedSpecOpt">Check this box if you want to use a specific server for your connection</string>
+	<string name="SettingsAdvancedAddOpt">Allow to edit the server address</string>
+	<string name="SettingsAdvancedPortOpt">Allow to edit the server port</string>
+	
+	<!-- Subscription class -->
+	<string name="SubscriptAccept">Subscription accepted</string>
+	<string name="SubscriptError">Subscription error</string>
+	<string name="SubscriptRefused">Subscription refused</string>
+	<string name="SubscriptText">You have received a request for add by %s. Do you want to accept it ?</string>
+	
+	<!-- ContactList class -->
+	<string name="ConListNotConnected">Not connected</string>
+
+	<!--  BeemChatManager -->
+	<string name="BeemChatManagerNewMessage">You\'ve got a new message</string>
+	
+	<!--  BeemBroadcastReceiver class -->
+	<string name="BeemBroadcastReceiverDisconnect">You have been disconnected</string>
+	
+	<!--  XmppConnectionAdapter class -->
+	<string name="AcceptContactRequest">Accept contact request</string>
+	<string name="AcceptContactRequestFrom">Accept contact request from </string>
+	
+    <!--
+    	Services
+    -->
+    
+    <!--
+    	Activities
+    -->
+    <string name="login_tag">Beem - Login Activity</string>
+    <string name="edit_settings_name">Beem - Settings</string>
+	<string name="edit_settings_tag">Beem - EditSettings Activity</string>	
+    <string name="create_account_name">Beem - Create an account</string>
+    <string name="create_account_tag">Beem - CreateAccount Activity</string>
+    <string name="contact_list_name">Beem - Contacts</string>
+    <string name="contact_list_tag">Beem - ContactList Activity</string>
+    <string name="user_info_name">Beem - User Info</string>
+
+    
+    <!--
+    	Buttons
+    -->
+    <string name="button_reset">Reset</string>
+    <string name="button_login">Login</string>
+    <string name="button_save">Save</string>
+    <string name="button_create_account">Create this account</string>
+    <string name="button_create_login_account">Create and log</string>