diff --git a/res/values/strings.xml b/res/values/strings.xml
index 72415d678..6f9dad17d 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="pref_video_use_front_camera_title">Use front camera (if any)</string>
+    <string name="pref_video_use_front_camera_title">Use front camera</string>
     <string name="pref_video_use_front_camera_key">pref_video_use_front_camera_key</string>
 	<string name="pref_video">Video</string>
 	<string name="pref_preferences">Preferences</string>
@@ -10,7 +10,7 @@
     <string name="pref_video_codec_mpeg4_key">pref_video_codec_mpeg4_key</string>
     <string name="pref_video_codec_h264_title">H264</string>
     <string name="pref_video_codec_h264_key">pref_video_codec_h264_key</string>
-    <string name="pref_video_codecs_title">Video codecs</string>
+    <string name="pref_video_codecs_title">Codecs</string>
     <string name="pref_video_codecs_key">pref_video_codecs_key</string>
 	<string name="menu_videocall_back_to_dialer_title">Display dialer</string>
 	<string name="menu_videocall_switch_camera_title">Front/Rear Camera</string>
@@ -22,14 +22,14 @@
 	<string name="menu_videocall_toggle_camera_enable">Enable camera</string>
 	<string name="menu_videocall_terminate_call_title">Terminate call</string>
     <string name="pref_video_settings_title">Video settings</string>
-    <string name="pref_video_automatically_share_my_video_title">Share my camera</string>
-    <string name="pref_video_initiate_call_with_video_title">Initiate video calls</string>
-    <string name="pref_video_enable_title">Enable Video</string>
-    <string name="pref_video_automatically_share_my_video">Automatically send videos from my camera</string>
     <string name="pref_video_automatically_share_my_video_key">pref_video_automatically_share_my_video_key</string>
+    <string name="pref_video_automatically_share_my_video_title">Share my camera</string>
+    <string name="pref_video_automatically_share_my_video">Automatically send my camera on incoming calls</string>
     <string name="pref_video_initiate_call_with_video_key">pref_video_initiate_call_with_video_key</string>
-    <string name="pref_video_initiate_call_with_video">Initiate outgoing calls with video</string>
+    <string name="pref_video_initiate_call_with_video_title">Initiate video calls</string>
+    <string name="pref_video_initiate_call_with_video">Always send my camera on outgoing calls</string>
     <string name="pref_video_enable_key">pref_video_enable_key</string>
+    <string name="pref_video_enable_title">Enable Video</string>
     <string name="pref_escape_plus">Replace + by 00</string>
     <string name="pref_escape_plus_key">pref_escape_plus_key</string>
     <string name="pref_ilbc_summary">iLBC might be unavailable depending on ARM processor and Android OS version.</string>
@@ -57,7 +57,7 @@
     <string name="pref_codec_speex16">speex 16 Khz</string>
     <string name="pref_codec_speex16_key">pref_codec_speex16_key</string>
     <string name="pref_codec_speex32_key">pref_codec_speex32_key</string>
-    <string name="pref_codecs">Audio Codecs</string>
+    <string name="pref_codecs">Codecs</string>
     <string name="pref_codecs_key">pref_codecs_key</string>
     <string name="place_call_chooser">Place a call</string>
 <string name="pref_debug">Debug</string>
@@ -97,7 +97,7 @@
 <string name="notification_registered">registered to %s </string> 
 <string name="notification_register_failure">fails to register to %s</string>
 <string name="notification_started">started</string>
-<string name="pref_echo_cancellation_summary">Removes the echo heared by the other end.</string>
+<string name="pref_echo_cancellation_summary">Removes the echo heard by other end</string>
 <string name="pref_stun_server">Stun server</string>
 <string name="pref_stun_server_key">pref_stun_server_key</string>
 </resources>
diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml
index 007515444..60304b22f 100644
--- a/res/xml/preferences.xml
+++ b/res/xml/preferences.xml
@@ -42,6 +42,9 @@
 
 
 	<PreferenceCategory android:title="@string/pref_audio">
+		<CheckBoxPreference android:key="@string/pref_echo_cancellation_key"
+			android:title="@string/pref_echo_cancellation" android:summary="@string/pref_echo_cancellation_summary"></CheckBoxPreference>
+
 		<PreferenceScreen android:title="@string/pref_codecs"
 			android:key="@string/pref_codecs_key">
 			<CheckBoxPreference android:key="@string/pref_codec_speex16_key"
@@ -60,15 +63,28 @@
 			<CheckBoxPreference android:key="@string/pref_codec_pcma_key"
 				android:title="@string/pref_codec_pcma" android:defaultValue="true"></CheckBoxPreference>
 		</PreferenceScreen>
-
-		<CheckBoxPreference android:key="@string/pref_echo_cancellation_key"
-			android:title="@string/pref_echo_cancellation" android:summary="@string/pref_echo_cancellation_summary"></CheckBoxPreference>
 	</PreferenceCategory>
 
 
 
 
 	<PreferenceCategory android:title="@string/pref_video" android:dependency="@string/pref_video_enable_key" android:shouldDisableView="true">
+	<CheckBoxPreference android:key="@string/pref_video_use_front_camera_key"
+		android:title="@string/pref_video_use_front_camera_title"
+		android:dependency="@string/pref_video_enable_key"></CheckBoxPreference>
+
+	<CheckBoxPreference android:key="@string/pref_video_initiate_call_with_video_key"
+		android:defaultValue="false"
+		android:title="@string/pref_video_initiate_call_with_video_title"
+		android:summary="@string/pref_video_initiate_call_with_video"
+		android:dependency="@string/pref_video_enable_key"></CheckBoxPreference>
+
+	<CheckBoxPreference
+		android:key="@string/pref_video_automatically_share_my_video_key"
+		android:title="@string/pref_video_automatically_share_my_video_title"
+		android:defaultValue="false" android:summary="@string/pref_video_automatically_share_my_video"
+		android:dependency="@string/pref_video_enable_key"></CheckBoxPreference>
+
 		<PreferenceScreen android:dependency="@string/pref_video_enable_key"
 			android:shouldDisableView="true" android:key="@string/pref_video_codecs_key"
 			android:title="@string/pref_video_codecs_title">
@@ -78,28 +94,10 @@
 			<CheckBoxPreference android:key="@string/pref_video_codec_mpeg4_key"
 				android:title="@string/pref_video_codec_mpeg4_title"
 				android:defaultValue="true"></CheckBoxPreference>
-			<CheckBoxPreference android:key="@string/pref_video_codec_h263_key"
+<!-- 			<CheckBoxPreference android:key="@string/pref_video_codec_h263_key"
 				android:title="@string/pref_video_codec_h263_title" android:enabled="false"
-				android:defaultValue="false" android:selectable="false"></CheckBoxPreference>
+				android:defaultValue="false" android:selectable="false"></CheckBoxPreference>-->
 		</PreferenceScreen>
-
-
-		<PreferenceScreen android:title="@string/pref_video_settings_title"
-			android:dependency="@string/pref_video_enable_key"
-			android:shouldDisableView="true">
-			<CheckBoxPreference android:key="@string/pref_video_initiate_call_with_video_key"
-				android:defaultValue="false"
-				android:title="@string/pref_video_initiate_call_with_video_title"
-				android:summary="@string/pref_video_initiate_call_with_video"
-				android:dependency="@string/pref_video_enable_key"></CheckBoxPreference>
-			<CheckBoxPreference
-				android:key="@string/pref_video_automatically_share_my_video_key"
-				android:title="@string/pref_video_automatically_share_my_video_title"
-				android:defaultValue="false"
-				android:summary="@string/pref_video_automatically_share_my_video"
-				android:dependency="@string/pref_video_enable_key"></CheckBoxPreference>
-		</PreferenceScreen>
-	<CheckBoxPreference android:key="@string/pref_video_use_front_camera_key" android:title="@string/pref_video_use_front_camera_title"></CheckBoxPreference>
 </PreferenceCategory>