diff -r 41d5d97b74fd -r 49e6af1887f7 res/layout/preferences.xml
--- a/res/layout/preferences.xml	Tue Dec 28 11:35:34 2010 +0100
+++ b/res/layout/preferences.xml	Wed Dec 29 13:04:38 2010 +0100
@@ -8,6 +8,9 @@
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
 	android:shouldDisableView="true" android:selectable="true">
 	<PreferenceCategory android:title="@string/general_preferences">
+		<CheckBoxPreference android:id="@+id/settings_key_history"
+			android:title="@string/history" android:defaultValue="false"
+			android:key="settings_key_history" />
 		<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"
@@ -31,10 +34,9 @@
 			<CheckBoxPreference android:title="@string/notification_enable_vibrate_title"
 				android:defaultValue="false" android:summary="@string/notification_enable_vibrate_sum"
 				android:key="notification_vibrate" />
-			<RingtonePreference
-				android:title="@string/notification_snd_title" android:key="notification_sound"
-				android:summary="@string/notification_snd_sum" android:ringtoneType="notification"
-				android:showDefault="true" />
+			<RingtonePreference android:title="@string/notification_snd_title"
+				android:key="notification_sound" android:summary="@string/notification_snd_sum"
+				android:ringtoneType="notification" android:showDefault="true" />
 		</PreferenceScreen>
 	</PreferenceCategory>
 	<PreferenceCategory android:title="@string/user_preferences">
@@ -73,7 +75,8 @@
 				<EditTextPreference android:singleLine="true"
 					android:dependency="proxy_use" android:name="port"
 					android:summary="@string/SettingsProxyPort" android:title="@string/settings_proxy_port"
-					android:key="proxy_port" android:numeric="signed" android:hint="@string/comments_proxy_port" />
+					android:key="proxy_port" android:numeric="signed"
+					android:hint="@string/comments_proxy_port" />
 			</PreferenceCategory>
 			<PreferenceCategory android:title="@string/proxy_user_settings">
 				<EditTextPreference android:singleLine="true"