--- a/res/layout/preferences.xml	Sun Jan 02 17:00:53 2011 +0100
+++ b/res/layout/preferences.xml	Sun Jan 02 17:22:46 2011 +0100
@@ -89,6 +89,7 @@
 					android:title="@string/settings_proxy_password" android: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">
@@ -113,6 +114,9 @@
 				android:summary="@string/SettingsAdvancedPortOpt" android:title="@string/settings_xmpp_port"
 				android:defaultValue="5222" android:numeric="signed" android:key="settings_key_xmpp_port"
 				android:hint="@string/comments_xmpp_port" />
+			<CheckBoxPreference android:title="@string/settings_full_jid_login"
+				android:defaultValue="false" android:summary="@string/settings_full_jid_login_sum"
+				android:key="full_jid_login" />
 		</PreferenceScreen>
 	</PreferenceCategory>
 </PreferenceScreen>

--- a/res/values-fr/strings.xml	Sun Jan 02 17:00:53 2011 +0100
+++ b/res/values-fr/strings.xml	Sun Jan 02 17:22:46 2011 +0100
@@ -120,6 +120,8 @@
 	<string name="settings_chat_compact">Chat compact</string>
 	<string name="settings_chat_compact_sum">Activer la fenetre Chat compact</string>
 	<string name="settings_smack_debug">Activer le debugger XMPP</string>
+	<string name="settings_full_jid_login">Utiliser le JID entier en tant que login</string>
+	<string name="settings_full_jid_login_sum">Nécessaire pour certains serveurs (Google Talk)</string>
 	
 	<!-- Subscription class -->
 	<string name="SubscriptAccept">Inscription acceptée</string>

--- a/res/values/strings.xml	Sun Jan 02 17:00:53 2011 +0100
+++ b/res/values/strings.xml	Sun Jan 02 17:22:46 2011 +0100
@@ -123,6 +123,8 @@
 	<string name="history_mount">You need to have SDcard mounted and writable to enable history</string>
 	<string name="history_on_off">Enable history messages</string>
 	<string name="settings_smack_debug">Enable XMPPP debug</string>
+	<string name="settings_full_jid_login">Use my full JID as username</string>
+	<string name="settings_full_jid_login_sum">Need by some server such as Google Talk</string>
 
 	<!-- Subscription class -->
 	<string name="SubscriptAccept">Subscription accepted</string>

--- a/src/com/beem/project/beem/BeemApplication.java	Sun Jan 02 17:00:53 2011 +0100
+++ b/src/com/beem/project/beem/BeemApplication.java	Sun Jan 02 17:22:46 2011 +0100
@@ -85,6 +85,8 @@
     public static final String NOTIFICATION_SOUND_KEY = "notification_sound";
     /** Preference key for smack debugging. */
     public static final String SMACK_DEBUG_KEY = "smack_debug";
+    /** Preference key for full Jid for login. */
+    public static final String FULL_JID_LOGIN_KEY = "full_jid_login";
 
     //TODO add the other one
 

--- a/src/com/beem/project/beem/BeemService.java	Sun Jan 02 17:00:53 2011 +0100
+++ b/src/com/beem/project/beem/BeemService.java	Sun Jan 02 17:22:46 2011 +0100
@@ -205,11 +205,12 @@
 	if (mSettings.getBoolean("settings_key_specific_server", false)) {
 	    mHost = mSettings.getString("settings_key_xmpp_server", "");
 	    if ("".equals(mHost))
-		mHost = StringUtils.parseServer(tmpJid);
+		mHost = mService;
 	    String tmpPort = mSettings.getString("settings_key_xmpp_port", "5222");
 	    mPort = ("".equals(tmpPort)) ? DEFAULT_XMPP_PORT : Integer.parseInt(tmpPort);
 	}
-	if ("gmail.com".equals(mService) || "googlemail.com".equals(mService))  {
+	if (mSettings.getBoolean(BeemApplication.FULL_JID_LOGIN_KEY, false) ||
+	    "gmail.com".equals(mService) || "googlemail.com".equals(mService))  {
 	    mLogin = tmpJid;
 	}