diff -r 8cd09cb7b00b -r bc47c8518bfd res/layout/preferences.xml
--- a/res/layout/preferences.xml	Sun Mar 07 21:33:13 2010 +0100
+++ b/res/layout/preferences.xml	Sat Mar 13 19:32:08 2010 +0100
@@ -13,35 +13,37 @@
 			<CheckBoxPreference android:title="@string/away_chk_title"
 				android:defaultValue="true" android:summary="@string/away_chk_sum"
 				android:key="settings_away_chk" />
-			<EditTextPreference android:dependency="settings_away_chk" android:singleLine="true"
-			android:summary="@string/away_message_sum" android:title="@string/away_message_title"
-			android:key="settings_away_message"
-			android:hint="@string/away_message_hint" />
+			<EditTextPreference android:dependency="settings_away_chk"
+				android:singleLine="true" android:summary="@string/away_message_sum"
+				android:title="@string/away_message_title" android:key="settings_away_message"
+				android:hint="@string/away_message_hint" />
+		</PreferenceScreen>
+		<PreferenceScreen android:title="@string/notification_preferences">
+			<CheckBoxPreference android:title="@string/notification_disable_vibrate_title"
+				android:defaultValue="false" android:summary="@string/notification_disable_vibrate_sum"
+				android:key="settings_notification_disable_vibrate" />
+			<RingtonePreference
+				android:title="@string/notification_snd_title" android:key="settings_notification_snd"
+				android:summary="@string/notification_snd_sum" android:ringtoneType="notification"
+				android:showDefault="true" />
 		</PreferenceScreen>
 	</PreferenceCategory>
 	<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:hint="@string/login_username_info_default" />
+			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"
-		    android:summary="@string/SettingsResourceSummary"
-		    android:defaultValue="Beem" />
-		<EditTextPreference
-		    android:key="settings_key_priority"
-		    android:title="@string/SettingsPriorityTitle"
-		    android:summary="@string/SettingsPrioritySummary"
-		    android:numeric="signed"
-		    android:defaultValue="0" />
+		<EditTextPreference android:key="settings_key_resource"
+			android:title="@string/SettingsResourceTitle" android:summary="@string/SettingsResourceSummary"
+			android:defaultValue="Beem" />
+		<EditTextPreference android:key="settings_key_priority"
+			android:title="@string/SettingsPriorityTitle" android:summary="@string/SettingsPrioritySummary"
+			android:numeric="signed" android:defaultValue="0" />
 	</PreferenceCategory>
-
 	<PreferenceCategory android:title="@string/network_preferences">
 		<PreferenceScreen android:key="proxy" android:title="@string/SettingsProxy"
 			android:summary="@string/settings_proxy_sum">
@@ -61,8 +63,7 @@
 				<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:hint="@string/comments_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"
@@ -91,13 +92,12 @@
 			<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:hint="@string/comments_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:hint="@string/comments_xmpp_port"/>
+				android:defaultValue="5222" android:key="settings_key_xmpp_port"
+				android:hint="@string/comments_xmpp_port" />
 		</PreferenceScreen>
 	</PreferenceCategory>
 </PreferenceScreen>