diff --git a/.gitignore b/.gitignore
index 83bec1ac8..3a33fd217 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,6 @@ obj
 gen
 bin
 doc
+ant.properties
+local.properties
+project.properties
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 10c22e27a..930c4dde9 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -3,7 +3,25 @@
       package="org.linphone"
       android:versionCode="1310" android:versionName="1.3.1"  android:installLocation="auto"> 
     <uses-sdk android:minSdkVersion="4"/>
-
+    
+	<uses-permission android:name="android.permission.INTERNET"/>
+	<uses-permission android:name="android.permission.RECORD_AUDIO"/>
+	<uses-permission android:name="android.permission.READ_CONTACTS"/>
+	<uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS"/>
+	<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
+	<uses-permission android:name="android.permission.WAKE_LOCK"/>
+	<uses-permission android:name="android.permission.PROCESS_OUTGOING_CALLS"/>
+	<uses-permission android:name="android.permission.CALL_PHONE"/>
+	<!-- Needed to allow Linphone to install on tablets, since android.permission.CALL_PHONE implies android.hardware.telephony is required -->
+	<uses-feature 	 android:name="android.hardware.telephony" android:required="false" /> 
+	<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
+	<uses-permission android:name="android.permission.VIBRATE"/>
+	<uses-permission android:name="android.permission.CAMERA" />
+	<uses-permission android:name="android.permission.READ_LOGS" />
+	<uses-permission android:name="android.permission.READ_PHONE_STATE" />
+	
+	<supports-screens android:smallScreens="true" android:normalScreens="true" android:largeScreens="true" android:xlargeScreens="true" android:anyDensity="true"/>
+    
     <!-- Don't remove the space after android:debuggable: it prevents ndk-build to try including gdbserver and crash gcc -->
     <application android:label="@string/app_name" android:debuggable ="true" android:icon="@drawable/logo_linphone_57x57">
 
@@ -205,23 +223,4 @@
          </activity>
 </application>
 
-
-<uses-permission android:name="android.permission.INTERNET"/>
-<uses-permission android:name="android.permission.RECORD_AUDIO"/>
-<uses-permission android:name="android.permission.READ_CONTACTS"/>
-<uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS"/>
-<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
-<uses-permission android:name="android.permission.WAKE_LOCK"/>
-<uses-permission android:name="android.permission.PROCESS_OUTGOING_CALLS"/>
-<uses-permission android:name="android.permission.CALL_PHONE"/>
-<!-- Needed to allow Linphone to install on tablets, since android.permission.CALL_PHONE implies android.hardware.telephony is required -->
-<uses-feature 	 android:name="android.hardware.telephony" android:required="false" /> 
-<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
-<uses-permission android:name="android.permission.VIBRATE"/>
-<uses-permission android:name="android.permission.CAMERA" />
-<uses-permission android:name="android.permission.READ_LOGS" />
-
-<uses-permission android:name="android.permission.READ_PHONE_STATE" />
-
-<supports-screens android:smallScreens="true" android:normalScreens="true" android:largeScreens="true" android:anyDensity="true"/>
 </manifest> 
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 39a44158e..3ee1e4190 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -261,4 +261,6 @@
 
 <string name="pref_help_proxy">SIP proxy hostname or ip address (optional)</string>
 <string name="pref_help_outbound_proxy">Route all calls through SIP proxy</string>
+<string name="pref_help_username">Example: john if your account is john@sip.linphone.org</string>
+<string name="pref_help_domain">sip.linphone.org if your account is john@sip.linphone.org</string>
 </resources>
diff --git a/src/org/linphone/LinphonePreferencesSIPAccountActivity.java b/src/org/linphone/LinphonePreferencesSIPAccountActivity.java
index 46c63074b..c61762e1d 100644
--- a/src/org/linphone/LinphonePreferencesSIPAccountActivity.java
+++ b/src/org/linphone/LinphonePreferencesSIPAccountActivity.java
@@ -57,8 +57,7 @@ public class LinphonePreferencesSIPAccountActivity extends PreferenceActivity {
     	username.getEditText().setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_EMAIL_ADDRESS);
     	username.setTitle(getString(R.string.pref_username));
     	username.setPersistent(true);
-    	//TODO make it translatable, use john instead of toto.
-    	//username.setDialogMessage("Example: toto if your account is toto@sip.linphone.org");
+    	username.setDialogMessage(getString(R.string.pref_help_username));
     	username.setKey(getString(R.string.pref_username_key) + getAccountNumber(n));
     	username.setOnPreferenceChangeListener(preferenceChangedListener);
     	
@@ -72,8 +71,7 @@ public class LinphonePreferencesSIPAccountActivity extends PreferenceActivity {
     	domain.getEditText().setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_EMAIL_ADDRESS);
     	domain.setTitle(getString(R.string.pref_domain));
     	domain.setPersistent(true);
-    	//TODO make it translatable, use john instead of toto.
-    	//domain.setDialogMessage("Example: sip.linphone.org if your account is toto@sip.linphone.org");
+    	domain.setDialogMessage(getString(R.string.pref_help_domain));
     	domain.setKey(getString(R.string.pref_domain_key) + getAccountNumber(n));
     	domain.setOnPreferenceChangeListener(preferenceChangedListener);