--- a/res/layout/preferences.xml	Fri Jan 15 11:58:04 2010 +0100
+++ b/res/layout/preferences.xml	Fri Jan 15 12:02:29 2010 +0100
@@ -12,10 +12,13 @@
 	<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" />
+			android:key="settings_key_account_username"
+			android:hint="@string/login_username_info_default" />
 		<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" />
+	</PreferenceCategory>
+	<PreferenceCategory android:title="@string/user_preferences_advanced">
 		<EditTextPreference
 		    android:key="settings_key_resource"
 		    android:title="@string/SettingsResourceTitle"
@@ -25,7 +28,7 @@
 		    android:key="settings_key_priority"
 		    android:title="@string/SettingsPriorityTitle"
 		    android:summary="@string/SettingsPrioritySummary"
-		    android:numeric="integer"
+		    android:numeric="signed"
 		    android:defaultValue="0" />
 		<CheckBoxPreference android:title="@string/SettingsCheckboxText"
 			android:defaultValue="false" android:summary="@string/SettingsGmail"
@@ -51,7 +54,8 @@
 				<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" />
+					android:key="settings_key_proxy_port"
+					android:hint="@string/comments_proxy_port" />
 			</PreferenceCategory>
 			<PreferenceCategory android:title="@string/proxy_user_settings">
 				<EditTextPreference android:singleLine="true"
@@ -80,11 +84,13 @@
 			<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" />
+				android:key="settings_key_xmpp_server" 
+				android:hint="@string/comments_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" />
+				android:defaultValue="5222" android:key="settings_key_xmpp_port" 
+				android:hint="@string/comments_xmpp_port"/>
 		</PreferenceScreen>
 	</PreferenceCategory>
 </PreferenceScreen>