--- a/res/layout/chat.xml	Sun Nov 15 18:35:52 2009 +0100
+++ b/res/layout/chat.xml	Sun Nov 15 20:40:15 2009 +0100
@@ -3,9 +3,9 @@
 	android:layout_width="fill_parent" android:layout_height="fill_parent"
 	android:orientation="vertical">
 	<LinearLayout android:id="@+id/chat_header"
-		android:layout_width="fill_parent" android:layout_height="wrap_content" android:orientation="horizontal"
-		android:gravity="center_vertical" android:background="#222222"
-		android:padding="4px">
+		android:layout_width="fill_parent" android:layout_height="wrap_content"
+		android:orientation="horizontal" android:gravity="center_vertical"
+		android:background="#222222" android:padding="4px">
 		<ImageView android:id="@+id/chat_contact_status_icon"
 			android:adjustViewBounds="true" android:layout_width="wrap_content"
 			android:layout_height="wrap_content" android:gravity="center_vertical" />
@@ -25,13 +25,20 @@
 	<View android:layout_width="fill_parent" android:layout_height="2dp"
 		android:fadingEdge="horizontal" android:background="#555555" />
 	<ListView android:id="@+id/chat_messages"
-		android:layout_width="fill_parent"
-		android:layout_height="0px" android:layout_weight="1"
-		android:transcriptMode="normal" android:fastScrollEnabled="true"
-		android:smoothScrollbar="false" android:layout_marginBottom="20sp"
-		android:padding="4px" />
-	<EditText android:id="@+id/chat_input" android:layout_width="fill_parent"
-		android:layout_height="wrap_content" android:inputType="textShortMessage|textAutoComplete"
-		android:imeOptions="actionSend" android:cursorVisible="true"
-		android:hint="@string/chat_input_default_value" />
+		android:layout_width="fill_parent" android:layout_height="0px"
+		android:layout_weight="1" android:transcriptMode="normal"
+		android:fastScrollEnabled="true" android:smoothScrollbar="false"
+		android:layout_marginBottom="20sp" android:padding="4px" />
+	<LinearLayout android:layout_width="fill_parent"
+		android:layout_height="wrap_content" android:orientation="horizontal"
+		android:background="#222222" android:padding="8px">
+		<EditText android:id="@+id/chat_input" android:layout_width="wrap_content"
+			android:layout_height="fill_parent" android:layout_weight="1"
+			android:ellipsize="end" android:inputType="textAutoComplete|textAutoCorrect"
+			android:imeOptions="actionSend" android:cursorVisible="true"
+			android:hint="@string/chat_input_default_value" />
+		<Button android:id="@+id/chat_send_message"
+			android:layout_width="wrap_content" android:layout_height="fill_parent"
+			android:text="@string/chat_send_message" />
+	</LinearLayout>
 </LinearLayout>

--- a/res/layout/preferences.xml	Sun Nov 15 18:35:52 2009 +0100
+++ b/res/layout/preferences.xml	Sun Nov 15 20:40:15 2009 +0100
@@ -1,167 +1,79 @@
 <?xml version="1.0" encoding="utf-8"?>
-<PreferenceScreen
-	xmlns:android="http://schemas.android.com/apk/res/android"
-	android:shouldDisableView="true"	
-	android:selectable="true">
-
-	<PreferenceCategory
-		android:title="@string/general_preferences">
-		
-		<PreferenceScreen
-			android:key="contact_list"
-			android:title="@string/contact_list_preferences"
-			android:summary="@string/contact_list_preferences_sum">
-			
-			<CheckBoxPreference
-				android:title="@string/CLP_hidden_contact"
-				android:defaultValue="false"
-				android:summary="@string/CLP_hidden_contact_sum"
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+	android:shouldDisableView="true" android:selectable="true">
+	<PreferenceCategory android:title="@string/general_preferences">
+		<PreferenceScreen android:key="contact_list"
+			android:title="@string/contact_list_preferences" android:summary="@string/contact_list_preferences_sum">
+			<CheckBoxPreference android:title="@string/CLP_hidden_contact"
+				android:defaultValue="false" android:summary="@string/CLP_hidden_contact_sum"
 				android:key="settings_key_hidden_contact" />
-
 		</PreferenceScreen>
-
 	</PreferenceCategory>
-	
-	<PreferenceCategory
-		android:title="@string/user_preferences">
-
-		<EditTextPreference
-			android:singleLine="true"
-			android:summary="@string/SettingsText"
-			android:title="@string/settings_account_username"
+	<PreferenceCategory android:title="@string/user_preferences">
+		<EditTextPreference android:singleLine="true"
+			android:summary="@string/SettingsText" android:title="@string/settings_account_username"
 			android:key="settings_key_account_username" />
-		<EditTextPreference
-			android:name="password"
-			android:singleLine="true"
-			android:password="true"
-			android:summary="@string/SettingsPassword"
-			android:title="@string/settings_account_password"
-			android:key="settings_key_account_password" />
-
-		<CheckBoxPreference
-			android:title="@string/SettingsCheckboxText"
-			android:defaultValue="false"
-			android:summary="@string/SettingsGmail"
+		<EditTextPreference android:name="password"
+			android:singleLine="true" android:password="true" android:summary="@string/SettingsPassword"
+			android:title="@string/settings_account_password" android:key="settings_key_account_password" />
+		<CheckBoxPreference android:title="@string/SettingsCheckboxText"
+			android:defaultValue="false" android:summary="@string/SettingsGmail"
 			android:key="settings_key_gmail" />
-		
-	</PreferenceCategory>		
-
-	<PreferenceCategory
-		android:title="@string/network_preferences">
-	
-		<PreferenceScreen
-			android:key="proxy"
-			android:title="@string/SettingsProxy"
-			android:summary="@string/settings_proxy_sum">
-	
-			<CheckBoxPreference
-				android:title="@string/SettingsProxyProxy"
-				android:defaultValue="false"
-				android:summary="@string/SettingsProxySummary"
-				android:key="settings_key_proxy_use" />
-	
-			<PreferenceCategory
-			   android:title="@string/proxy_proxy_settings">
-
-				<ListPreference
-					android:dependency="settings_key_proxy_use"
-					android:title="@string/SettingsProxyType"
-					android:entries="@array/proxy_types"
-					android:summary="@string/SettingsProxyTypeSummary"
-					android:defaultValue="HTTP"
-					android:entryValues="@array/proxy_types"
-					android:key="settings_key_proxy_type" />
-
-				<EditTextPreference
-					android:singleLine="true"
-					android:dependency="settings_key_proxy_use"
-					android:name="serveur"
-					android:summary="@string/SettingsProxyServer"
-					android:title="@string/settings_proxy_server"
-					android:key="settings_key_proxy_server" />
+	</PreferenceCategory>
 
-				<EditTextPreference 
-					android:singleLine="true"
-					android:dependency="settings_key_proxy_use"
-					android:name="port"
-					android:summary="@string/SettingsProxyPort"
-					android:title="@string/settings_proxy_port"
+	<PreferenceCategory android:title="@string/network_preferences">
+		<PreferenceScreen android:key="proxy" android:title="@string/SettingsProxy"
+			android:summary="@string/settings_proxy_sum">
+			<CheckBoxPreference android:title="@string/SettingsProxyProxy"
+				android:defaultValue="false" android:summary="@string/SettingsProxySummary"
+				android:key="settings_key_proxy_use" />
+			<PreferenceCategory android:title="@string/proxy_proxy_settings">
+				<ListPreference android:dependency="settings_key_proxy_use"
+					android:title="@string/SettingsProxyType" android:entries="@array/proxy_types"
+					android:summary="@string/SettingsProxyTypeSummary"
+					android:defaultValue="HTTP" android:entryValues="@array/proxy_types"
+					android:key="settings_key_proxy_type" />
+				<EditTextPreference android:singleLine="true"
+					android:dependency="settings_key_proxy_use" android:name="serveur"
+					android:summary="@string/SettingsProxyServer" android:title="@string/settings_proxy_server"
+					android:key="settings_key_proxy_server" />
+				<EditTextPreference android:singleLine="true"
+					android:dependency="settings_key_proxy_use" android:name="port"
+					android:summary="@string/SettingsProxyPort" android:title="@string/settings_proxy_port"
 					android:key="settings_key_proxy_port" />
-
 			</PreferenceCategory>
-			
-			<PreferenceCategory
-			   android:title="@string/proxy_user_settings">
-
-				<EditTextPreference
-					android:singleLine="true"
-					android:dependency="settings_key_proxy_use"
-					android:name="Utilisateur"
-					android:summary="@string/SettingsProxyUser"
-					android:title="@string/settings_proxy_username"
+			<PreferenceCategory android:title="@string/proxy_user_settings">
+				<EditTextPreference android:singleLine="true"
+					android:dependency="settings_key_proxy_use" android:name="Utilisateur"
+					android:summary="@string/SettingsProxyUser" android:title="@string/settings_proxy_username"
 					android:key="settings_key_proxy_username" />
-
-				<EditTextPreference
-					android:singleLine="true"
-					android:dependency="settings_key_proxy_use"
-					android:name="pass_user"
-					android:password="true"
-					android:summary="@string/SettingsProxyPassword"
-					android:title="@string/settings_proxy_password"
-					android:key="settings_key_proxy_password" />
-
+				<EditTextPreference android:singleLine="true"
+					android:dependency="settings_key_proxy_use" android:name="pass_user"
+					android:password="true" android:summary="@string/SettingsProxyPassword"
+					android:title="@string/settings_proxy_password" android:key="settings_key_proxy_password" />
 			</PreferenceCategory>
-	
 		</PreferenceScreen>
-	
-		<PreferenceScreen
-			android:key="advanced"
-			android:title="@string/SettingsAdvanced"
-			android:summary="@string/settings_advanced_sum">
-			
-			<PreferenceCategory
-				android:title="@string/settings_advanced_service_behaviour">
-	
-				<CheckBoxPreference
-					android:title="@string/settings_xmpp_use_tls"
-					android:defaultValue="false"
-					android:key="settings_key_xmpp_tls_use" />
-				
-				<EditTextPreference
-					android:singleLine="true"
-					android:title="@string/settings_reco_delay"
-					android:name="Reconnect delay"
-					android:summary="@string/SettingsAdvancedRecoDelay"
-					android:key="settings_key_reco_delay"
+		<PreferenceScreen android:key="advanced"
+			android:title="@string/SettingsAdvanced" android:summary="@string/settings_advanced_sum">
+			<PreferenceCategory android:title="@string/settings_advanced_service_behaviour">
+				<CheckBoxPreference android:title="@string/settings_xmpp_use_tls"
+					android:defaultValue="false" android:key="settings_key_xmpp_tls_use" />
+				<EditTextPreference android:singleLine="true"
+					android:title="@string/settings_reco_delay" android:name="Reconnect delay"
+					android:summary="@string/SettingsAdvancedRecoDelay" android:key="settings_key_reco_delay"
 					android:defaultValue="10" />
-			
 			</PreferenceCategory>
-			
-			<CheckBoxPreference
-				android:title="@string/SettingsAdvancedOptions"
-				android:defaultValue="false"
-				android:summary="@string/SettingsAdvancedSpecOpt"
+			<CheckBoxPreference android:title="@string/SettingsAdvancedOptions"
+				android:defaultValue="false" android:summary="@string/SettingsAdvancedSpecOpt"
 				android:key="settings_key_specific_server" />
-				
-				<EditTextPreference
-					android:singleLine="true"
-					android:dependency="settings_key_specific_server"
-					android:name="adresse"
-					android:summary="@string/SettingsAdvancedAddOpt"
-					android:title="@string/settings_xmpp_server"
-					android:key="settings_key_xmpp_server"/>
-					
-				<EditTextPreference
-					android:singleLine="true"
-					android:dependency="settings_key_specific_server"
-					android:name="port"
-					android:summary="@string/SettingsAdvancedPortOpt"
-					android:title="@string/settings_xmpp_port"
-					android:defaultValue="5222"
-					android:key="settings_key_xmpp_port" />
-
+			<EditTextPreference android:singleLine="true"
+				android:dependency="settings_key_specific_server" android:name="adresse"
+				android:summary="@string/SettingsAdvancedAddOpt" android:title="@string/settings_xmpp_server"
+				android:key="settings_key_xmpp_server" />
+			<EditTextPreference android:singleLine="true"
+				android:dependency="settings_key_specific_server" android:name="port"
+				android:summary="@string/SettingsAdvancedPortOpt" android:title="@string/settings_xmpp_port"
+				android:defaultValue="5222" android:key="settings_key_xmpp_port" />
 		</PreferenceScreen>
-
 	</PreferenceCategory>
-	
 </PreferenceScreen>

--- a/res/values-fr/strings.xml	Sun Nov 15 18:35:52 2009 +0100
+++ b/res/values-fr/strings.xml	Sun Nov 15 20:40:15 2009 +0100
@@ -65,11 +65,11 @@
 	<string name="SendIMSmiley">Insérer un sourire</string>
 	<string name="SendIMLoginHint">Nom d\'utilisateur</string>
 	<string name="SendIMNoStatusSet">Aucun statut défini</string>
-	
+
 	<!--  ChangeStatus class -->
 	<string name="ChangeStatusActTitle">Beem - Changer mon statut</string>
 
-	<string name="ChangeStatusType">Mon statut</string>	
+	<string name="ChangeStatusType">Mon statut</string>
 	<string name="ChangeStatusMessage">Mon message personnel</string>
 	<string name="MenuAddContact">Ajouter un nouveau contact</string>
 	<string name="MenuAccountAbout">Beem Project</string>
@@ -77,75 +77,83 @@
 	<string name="MenuConnection">Modifier un compte</string>
 	<string name="ChangeStatusOk">Mise à jour du statut</string>
 	<string name="ChangeStatusNoChange">Rien à changer</string>
-	
+
 	<!-- Settings class -->
 	<string name="SettingsText">Saisissez votre identifiant de connexion</string>
 	<string name="SettingsPassword">Saisissez votre mot de passe</string>
 	<string name="SettingsCheckboxText">Utilisation de Gmail</string>
-	<string name="SettingsGmail">Cochez cette option si vous souhaitez utiliser votre compte Gmail</string>
+	<string name="SettingsGmail">Cochez cette option si vous souhaitez utiliser
+		votre compte Gmail</string>
 	<string name="SettingsProxy">Proxy</string>
 	<string name="SettingsProxyProxy">Utiliser un proxy</string>
 	<string name="SettingsProxySummary">Connectez vous à travers un serveur proxy</string>
 	<string name="SettingsProxyType">Protocole</string>
-	<string name="SettingsProxyTypeSummary">Permet de choisir le type de proxy à utiliser</string>
+	<string name="SettingsProxyTypeSummary">Permet de choisir le type de proxy à utiliser
+	</string>
 	<string name="SettingsProxyServer">Saisissez l\'adresse du serveur proxy</string>
-	<string name="SettingsProxyPort">Saisissez le numéro de port du serveur proxy</string>
-	<string name="SettingsProxyUser">Optionnel, permet de s\'authentifier sur le proxy</string>
-	<string name="SettingsProxyPassword">Optionnel, permet de s\'authentifier sur le proxy</string>
+	<string name="SettingsProxyPort">Saisissez le numéro de port du serveur proxy
+	</string>
+	<string name="SettingsProxyUser">Optionnel, permet de s\'authentifier sur le proxy
+	</string>
+	<string name="SettingsProxyPassword">Optionnel, permet de s\'authentifier sur le proxy
+	</string>
 	<string name="SettingsAdvanced">Options avancées</string>
 	<string name="SettingsAdvancedRecoDelay">Modifier le délai de reconnexion</string>
 	<string name="SettingsAdvancedOptions">Options spécifiques</string>
-	<string name="SettingsAdvancedSpecOpt">Cochez cette option pour utiliser un serveur spécifique </string>	
+	<string name="SettingsAdvancedSpecOpt">Cochez cette option pour utiliser un serveur
+		spécifique </string>
 	<string name="SettingsAdvancedAddOpt">Saisissez l\'adresse du serveur à joindre</string>
 	<string name="SettingsAdvancedPortOpt">Saisissez le port du serveur</string>
-	
+
 	<!-- Subscription class -->
 	<string name="SubscriptAccept">Inscription acceptée</string>
 	<string name="SubscriptError">Erreur d\'inscription</string>
 	<string name="SubscriptRefused">Inscription refusée</string>
-	<string name="SubscriptText">%s vient de vous ajouter à sa liste de contacts. Souhaitez-vous l\'autoriser ?</string>
+	<string name="SubscriptText">%s vient de vous ajouter à sa liste de contacts.
+		Souhaitez-vous l\'autoriser ?</string>
 	<string name="SubscriptTitle">Autoriser ce contact ?</string>
-	
+
 	<!-- ContactList class -->
 	<string name="ConListNotConnected">Non connecté(e)</string>
 
 	<!--  BeemChatManager class -->
 	<string name="BeemChatManagerNewMessage">Vous avez reçu un nouveau message</string>
-	
+
 	<!--  BeemBroadcastReceiver class -->
 	<string name="BeemBroadcastReceiverDisconnect">Vous avez été déconnecté(e)</string>
-	
+
 	<!--  XmppConnectionAdapter class -->
-	<string name="AcceptContactRequest">%s vient de vous ajouter à sa liste d'amis.</string>
+	<string name="AcceptContactRequest">%s vient de vous ajouter à sa liste d'amis.
+	</string>
 	<string name="AcceptContactRequestFrom">Autoriser %s à vous contacter.</string>
-	
-    <!--
+
+	<!--
     	Services
     -->
-    
-    <!--
+
+	<!--
     	Activities
     -->
-    <string name="login_tag">Beem - Activité de connexion</string>
-    <string name="edit_settings_name">Beem - Paramètres</string>
+	<string name="login_tag">Beem - Activité de connexion</string>
+	<string name="edit_settings_name">Beem - Paramètres</string>
 	<string name="edit_settings_tag">Beem - EditSettings Activity</string>
-    <string name="create_account_name">Beem - Créer un compte</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 - Informations</string>
-    
-    <!--
+	<string name="create_account_name">Beem - Créer un compte</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 - Informations</string>
+
+	<!--
     	Buttons
     -->
-    <string name="button_reset">Réinitialiser</string>
-    <string name="button_login">Se connecter</string>
-    <string name="button_save">Enregistrer</string>
-    <string name="button_create_account">Créer ce compte</string>
-    <string name="button_create_login_account">Créer puis utiliser ce compte</string>
-    
-    
-    <!--
+	<string name="button_reset">Réinitialiser</string>
+	<string name="button_login">Se connecter</string>
+	<string name="button_save">Enregistrer</string>
+	<string name="button_create_account">Créer ce compte</string>
+	<string name="button_create_login_account">Créer puis utiliser ce compte</string>
+
+
+	<!--
     	LogAs Activity
     -->
 	<string name="login_username">Nom d\'utilisateur</string>
@@ -157,21 +165,24 @@
 	<string name="login_menu_about">A propos</string>
 	<string name="login_about_title">A propos</string>
 	<string name="login_about_msg">
-		Beem est un EPITECH Innovative Project. Rencontrez nous sur http://www.beem-project.com !
+		Beem est un EPITECH Innovative Project. Rencontrez
+		nous sur http://www.beem-project.com !
 	</string>
 	<string name="login_about_button">Fermer</string>
 	<string name="login_settings_button">Paramètres</string>
 	<string name="login_login_button">Connexion</string>
-	<string name="login_login_progress">Connexion en cours. Veuillez patienter...</string>	
-	<string name="login_error_msg">Malheureusement, une erreur est survenu.\n\nDétail de l\'erreur :\n%s</string>
-	
+	<string name="login_login_progress">Connexion en cours. Veuillez patienter...</string>
+	<string name="login_error_msg">Malheureusement, une erreur est survenu.\n\nDétail
+		de l\'erreur :\n%s</string>
+
 	<!--
 		EditSettings Activity
 	-->
 	<string name="settings_menu_create_account">Créer un compte</string>
 	<string name="settings_menu_login">Se connecter</string>
-	<string name="settings_saved_ok">Les paramètres ont été enregistrés avec succès.</string>
-	
+	<string name="settings_saved_ok">Les paramètres ont été enregistrés avec succès.
+	</string>
+
 	<string name="settings_key_account_username">beem_account_username</string>
 	<string name="settings_key_account_password">beem_account_password</string>
 	<string name="settings_key_xmpp_server">beem_xmpp_server</string>
@@ -184,7 +195,7 @@
 	<string name="settings_key_proxy_password">beem_xmpp_proxy_password</string>
 	<string name="settings_key_proxy_type">beem_xmpp_proxy_type</string>
 	<string name="settings_key_hidden_contact">settings_key_hidden_contact</string>
-	
+
 	<!-- EditSettings Activity Categories -->
 	<string name="general_preferences">Préférences de l\'application</string>
 	<string name="user_preferences">Utilisateur</string>
@@ -199,28 +210,31 @@
 	<string name="settings_tab_label_xmpp">XMPP</string>
 	<string name="settings_tab_tag_proxy">edit_settings_tab_proxy</string>
 	<string name="settings_tab_label_proxy">Proxy</string>
-	
+
 	<!-- EditSettings Activity General Preferences Tabs -->
 	<string name="contact_list_preferences">Liste d\'ami(e)s</string>
-	<string name="contact_list_preferences_sum">Une série d\'options d\'affichage de votre liste d\'ami(e)s</string>
+	<string name="contact_list_preferences_sum">Une série d\'options d\'affichage de votre liste
+		d\'ami(e)s</string>
 	<string name="CLP_hidden_contact">Caché(e)s</string>
-	<string name="CLP_hidden_contact_sum">Cochez cette option pour cacher les ami(e)s déconnecté(e)s</string>
-	
+	<string name="CLP_hidden_contact_sum">Cochez cette option pour cacher les ami(e)s
+		déconnecté(e)s</string>
+
 	<!-- EditSettings Activity Account tab -->
 	<string name="settings_account_username">Nom d\'utilisateur</string>
 	<string name="settings_account_password">Mot de passe</string>
 	<string name="settings_account_server">Serveur</string>
 	<string name="settings_account_port">Port</string>
-	
+
 	<!-- EditSettings Activity Advanced Options tab -->
 	<string name="settings_advanced_service_behaviour">Comportement du service</string>
-	<string name="settings_advanced_sum">Une série d\'options pour les utilisateurs avertis</string>
+	<string name="settings_advanced_sum">Une série d\'options pour les utilisateurs avertis
+	</string>
 	<string name="settings_xmpp_server">Serveur</string>
 	<string name="settings_xmpp_port">Port</string>
 	<string name="settings_xmpp_use_tls">Utiliser SSL/TLS</string>
 	<string name="settings_reco_delay">Délai de reconnexion</string>
 
-	
+
 	<!-- EditSettings Activity Proxy tab -->
 	<string name="settings_proxy_sum">Paramètrez un serveur proxy</string>
 	<string name="settings_proxy_use">Utiliser un proxy</string>
@@ -229,7 +243,7 @@
 	<string name="settings_proxy_port">Port</string>
 	<string name="settings_proxy_username">Nom d\'utilisateur</string>
 	<string name="settings_proxy_password">Mot de passe</string>
-	
+
 	<!--
 		Create an account Activity
 	-->
@@ -243,14 +257,14 @@
 	<string name="create_account_username">Nom d\'utilisateur</string>
 	<string name="create_account_password">Mot de passe</string>
 	<string name="create_account_confirm_password">Confirmation du mot de passe</string>
-	
+
 	<!--
 		ContactList Activity 
 	 -->
-	 <string name="contact_list_menu_add_contact">Ajouter un contact</string>
-	 <string name="contact_list_menu_settings">Paramètres</string>
-	 <string name="contact_list_all_contact">Tous les contacts</string>
-	 <string name="contact_list_no_group">Aucun groupe</string>
+	<string name="contact_list_menu_add_contact">Ajouter un contact</string>
+	<string name="contact_list_menu_settings">Paramètres</string>
+	<string name="contact_list_all_contact">Tous les contacts</string>
+	<string name="contact_list_no_group">Aucun groupe</string>
 
 
 	<!-- 
@@ -262,24 +276,28 @@
 	<string name="userinfo_label_block">Bloquer</string>
 	<string name="userinfo_label_delete">Supprimer</string>
 	<string name="userinfo_resend">Souscription réenvoyée</string>
-	<string name="userinfo_sure2delete">Etes-vous sûr de vouloir supprimer ce contact ?</string>
+	<string name="userinfo_sure2delete">Etes-vous sûr de vouloir supprimer ce contact ?
+	</string>
 	<string name="userinfo_yes">Oui</string>
 	<string name="userinfo_no">Non</string>
-	<string name="userinfo_sureresend">Etes vous sûr de vouloir renvoyer l\'invitation ?</string>
-	
+	<string name="userinfo_sureresend">Etes vous sûr de vouloir renvoyer l\'invitation ?
+	</string>
+
 	<string name="chat_input_default_value">Saisissez votre message</string>
 	<string name="chat_name">Beem - Chat</string>
 	<string name="chat_self">Moi</string>
+	<string name="chat_send_message">Envoyer</string>
+	<string name="chat_menu_contacts_list">Liste de contacts</string>
+	<string name="chat_menu_change_chat">Changer de conversation</string>
+	<string name="chat_dialog_change_chat_title">Conversations en cours</string>
+	<string name="chat_menu_close_chat">Fermer cette conversation</string>
+	<string name="chat_no_more_chats">Aucune conversation en cours</string>
+	
 	<string name="contact_status_msg_available">Disponible</string>
 	<string name="contact_status_msg_available_chat">Disponible pour clavarder</string>
 	<string name="contact_status_msg_dnd">Occupé(e)</string>
 	<string name="contact_status_msg_away">Parti(e)</string>
 	<string name="contact_status_msg_xa">Indisponible</string>
 	<string name="contact_status_msg_offline">Hors ligne</string>
-<string name="UpdateButton">Mettre à jour</string>
-<string name="chat_menu_contacts_list">Liste de contacts</string>
-<string name="chat_menu_change_chat">Changer de conversation</string>
-<string name="chat_dialog_change_chat_title">Conversations en cours</string>
-<string name="chat_menu_close_chat">Fermer cette conversation</string>
-<string name="chat_no_more_chats">Aucune conversation en cours</string>
+	<string name="UpdateButton">Mettre à jour</string>
 </resources>

--- a/res/values/strings.xml	Sun Nov 15 18:35:52 2009 +0100
+++ b/res/values/strings.xml	Sun Nov 15 20:40:15 2009 +0100
@@ -65,9 +65,9 @@
 	<string name="SendIMSmiley">Insert a smiley</string>
 	<string name="SendIMLoginHint">login</string>
 	<string name="SendIMNoStatusSet">No status set</string>
-	
+
 	<!--  ChangeStatus class -->
-	<string name="ChangeStatusType">My status</string>	
+	<string name="ChangeStatusType">My status</string>
 	<string name="ChangeStatusMessage">My personal message</string>
 
 	<string name="ChangeStatusActTitle">Beem - Change my status</string>
@@ -77,7 +77,7 @@
 	<string name="MenuConnection">Edit account</string>
 	<string name="ChangeStatusOk">Updating status</string>
 	<string name="ChangeStatusNoChange">Nothing to change</string>
-	
+
 	<!-- Settings class -->
 	<string name="SettingsText">Edit your username</string>
 	<string name="SettingsPassword">Edit your password</string>
@@ -90,53 +90,58 @@
 	<string name="SettingsProxyTypeSummary">Choose the proxy server type</string>
 	<string name="SettingsProxyServer">Edit proxy server address</string>
 	<string name="SettingsProxyPort">Edit proxy server port</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="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">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="SettingsAdvancedSpecOpt">Check this box if you want to use a specific server
+		for your connection</string>
 	<string name="SettingsAdvancedAddOpt">Edit the server address</string>
 	<string name="SettingsAdvancedPortOpt">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">%s wants to add you to his/her buddy list. Do you want to authorize him/her ?</string>
+	<string name="SubscriptText">%s wants to add you to his/her buddy list. Do you
+		want to authorize him/her ?</string>
 	<string name="SubscriptTitle">Authorize buddy ?</string>
-	
+
 	<!-- ContactList class -->
 	<string name="ConListNotConnected">Not connected</string>
 
 	<!--  BeemChatManager -->
 	<string name="BeemChatManagerNewMessage">You\'ve a new message</string>
-	
+
 	<!--  BeemBroadcastReceiver class -->
 	<string name="BeemBroadcastReceiverDisconnect">You have been disconnected</string>
-	
+
 	<!--  XmppConnectionAdapter class -->
-	<string name="AcceptContactRequest">%s has just added you to his/her buddy list.</string>
+	<string name="AcceptContactRequest">%s has just added you to his/her buddy list.
+	</string>
 	<string name="AcceptContactRequestFrom">Authorize %s to contact you.</string>
-    
-    <!-- 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 use this account</string>
+	<!-- 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>
 
-    <!-- LogAs Activity -->
+	<!-- 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 use this account</string>
+
+	<!-- LogAs Activity -->
 	<string name="login_username">Username</string>
 	<string name="login_password">Password</string>
 	<string name="login_error_dialog_title">Login - Error</string>
@@ -146,14 +151,16 @@
 	<string name="login_menu_about">About</string>
 	<string name="login_about_title">About</string>
 	<string name="login_about_msg">
-		Beem is an EPITECH Innovative Project. Visit us at http://www.beem-project.com !
+		Beem is an EPITECH Innovative Project. Visit us at
+		http://www.beem-project.com !
 	</string>
 	<string name="login_about_button">Close</string>
 	<string name="login_settings_button">Settings</string>
 	<string name="login_login_button">Log in</string>
 	<string name="login_login_progress">Connecting. Please wait...</string>
 	<string name="login_max_retry">Max retry</string>
-	<string name="login_error_msg">Unfortunately, an error occured.\n\nError detail:\n%s</string>
+	<string name="login_error_msg">Unfortunately, an error occured.\n\nError
+		detail:\n%s</string>
 
 	<!-- EditSettings Activity -->
 	<string name="settings_menu_create_account">Create an account</string>
@@ -172,7 +179,7 @@
 	<string name="settings_key_proxy_password">beem_xmpp_proxy_password</string>
 	<string name="settings_key_proxy_type">beem_xmpp_proxy_type</string>
 	<string name="settings_key_hidden_contact">settings_key_hidden_contact</string>
-	
+
 	<!-- EditSettings Activity Categories -->
 	<string name="general_preferences">General preferences</string>
 	<string name="user_preferences">User settings</string>
@@ -190,9 +197,11 @@
 
 	<!-- EditSettings Activity General Preferences Tabs -->
 	<string name="contact_list_preferences">Buddy list</string>
-	<string name="contact_list_preferences_sum">A set of display options for your buddy list</string>
+	<string name="contact_list_preferences_sum">A set of display options for your buddy list
+	</string>
 	<string name="CLP_hidden_contact">Hidden</string>
-	<string name="CLP_hidden_contact_sum">Check this option to hide unconnected buddies</string>
+	<string name="CLP_hidden_contact_sum">Check this option to hide unconnected buddies
+	</string>
 
 	<!-- EditSettings Activity Account tab -->
 	<string name="settings_account_username">Username</string>
@@ -216,7 +225,7 @@
 	<string name="settings_proxy_port">Port</string>
 	<string name="settings_proxy_username">Username</string>
 	<string name="settings_proxy_password">Password</string>
-	
+
 	<!-- Create an account Activity -->
 	<string name="create_account_instr_dialog_title">Create an account - Instructions</string>
 	<string name="create_account_err_dialog_title">Create an account - Error</string>
@@ -228,13 +237,13 @@
 	<string name="create_account_username">Username</string>
 	<string name="create_account_password">Password</string>
 	<string name="create_account_confirm_password">Confirm password</string>
-	
+
 	<!-- ContactList Activity  -->
 	<string name="contact_list_menu_add_contact">Add a contact</string>
 	<string name="contact_list_menu_settings">Settings</string>
 	<string name="contact_list_all_contact">All contacts</string>
 	<string name="contact_list_no_group">No group</string>
-	 
+
 	<!-- UserInfo Activity -->
 	<string name="userinfo_label_alias">Alias</string>
 	<string name="userinfo_label_chg_group">Manage groups</string>
@@ -242,7 +251,8 @@
 	<string name="userinfo_label_block">Block</string>
 	<string name="userinfo_label_delete">Delete</string>
 	<string name="userinfo_resend">Suscription resend</string>
-	<string name="userinfo_sure2delete">Are you sure you want to delete this contact ?</string>
+	<string name="userinfo_sure2delete">Are you sure you want to delete this contact ?
+	</string>
 	<string name="userinfo_yes">Yes</string>
 	<string name="userinfo_no">No</string>
 	<string name="userinfo_sureresend">Are you sure you want to resend invit ?</string>
@@ -250,6 +260,13 @@
 	<string name="chat_name">Beem - Chat</string>
 	<string name="chat_input_default_value">Type your message</string>
 	<string name="chat_self">Me</string>
+	<string name="chat_send_message">Send</string>
+	<string name="chat_menu_contacts_list">Contacts list</string>
+	<string name="chat_menu_change_chat">Switch chat</string>
+	<string name="chat_dialog_change_chat_title">Opened chats</string>
+	<string name="chat_menu_close_chat">Close this chat</string>
+	<string name="chat_no_more_chats">No more active chats</string>
+	
 	<string name="contact_status_msg_available">Available</string>
 	<string name="contact_status_msg_available_chat">Available to chat</string>
 	<string name="contact_status_msg_dnd">Do not disturb</string>
@@ -257,11 +274,5 @@
 	<string name="contact_status_msg_xa">Unavailable</string>
 	<string name="contact_status_msg_offline">Disconnected</string>
 
-<string name="UpdateButton">Update</string>
-
-<string name="chat_menu_contacts_list">Contacts list</string>
-<string name="chat_menu_change_chat">Switch chat</string>
-<string name="chat_dialog_change_chat_title">Opened chats</string>
-<string name="chat_menu_close_chat">Close this chat</string>
-<string name="chat_no_more_chats">No more active chats</string>
+	<string name="UpdateButton">Update</string>
 </resources>

--- a/src/com/beem/project/beem/ui/ChangeStatus.java	Sun Nov 15 18:35:52 2009 +0100
+++ b/src/com/beem/project/beem/ui/ChangeStatus.java	Sun Nov 15 20:40:15 2009 +0100
@@ -43,6 +43,7 @@
     private static final int AWAY_IDX = 3;
     private static final int UNAVAILABLE_IDX = 4;
     private static final int DISCONNECTED_IDX = 5;
+
     private EditText mStatusMessageEditText;
     private Toast mToast;
     private Button mOk;
@@ -73,10 +74,10 @@
 
 	mOk = (Button) findViewById(R.id.ChangeStatusOk);
 	mOk.setOnClickListener(mOnClickOk);
-	
+
 	mClear = (Button) findViewById(R.id.ChangeStatusClear);
 	mClear.setOnClickListener(mOnClickOk);
-	
+
 	mSettings = PreferenceManager.getDefaultSharedPreferences(this);
 	mStatusMessageEditText = (EditText) findViewById(R.id.ChangeStatusMessage);
 	mStatusMessageEditText.setText(getPreferenceString(R.string.PreferenceStatusText));

--- a/src/com/beem/project/beem/ui/Chat.java	Sun Nov 15 18:35:52 2009 +0100
+++ b/src/com/beem/project/beem/ui/Chat.java	Sun Nov 15 20:40:15 2009 +0100
@@ -31,8 +31,10 @@
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
+import android.view.View.OnClickListener;
 import android.view.View.OnKeyListener;
 import android.widget.BaseAdapter;
+import android.widget.Button;
 import android.widget.EditText;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
@@ -75,6 +77,7 @@
     private ImageView mContactStatusIcon;
     private ListView mMessagesListView;
     private EditText mInputField;
+    private Button mSendButton;
     private final Map<Integer, Bitmap> mStatusIconsMap = new HashMap<Integer, Bitmap>();
 
     private final List<MessageText> mListMessages = new ArrayList<MessageText>();
@@ -123,6 +126,13 @@
 	mMessagesListView.setAdapter(mMessagesListAdapter);
 	mInputField = (EditText) findViewById(R.id.chat_input);
 	mInputField.setOnKeyListener(this);
+	mSendButton = (Button) findViewById(R.id.chat_send_message);
+	mSendButton.setOnClickListener(new OnClickListener() {
+	    @Override
+	    public void onClick(View v) {
+		sendMessage();
+	    }
+	});
 
 	prepareIconsStatus();
 
@@ -849,4 +859,12 @@
 	}
 	Log.v(TAG, "END sendMessage.");
     }
+
+    private final OnClickListener mSendButtonClickListener = new OnClickListener() {
+
+	@Override
+	public void onClick(View v) {
+	    sendMessage();
+	}
+    };
 }