diff --git a/res/drawable-xhdpi/button_background_default.9.png b/res/drawable-xhdpi/button_background_default.9.png
new file mode 100644
index 000000000..c19f88e0b
Binary files /dev/null and b/res/drawable-xhdpi/button_background_default.9.png differ
diff --git a/res/drawable-xhdpi/button_background_default.png b/res/drawable-xhdpi/button_background_default.png
deleted file mode 100644
index 31efad8aa..000000000
Binary files a/res/drawable-xhdpi/button_background_default.png and /dev/null differ
diff --git a/res/drawable-xhdpi/button_background_over.9.png b/res/drawable-xhdpi/button_background_over.9.png
new file mode 100644
index 000000000..4c66f4a93
Binary files /dev/null and b/res/drawable-xhdpi/button_background_over.9.png differ
diff --git a/res/drawable-xhdpi/button_background_over.png b/res/drawable-xhdpi/button_background_over.png
deleted file mode 100644
index 44813921c..000000000
Binary files a/res/drawable-xhdpi/button_background_over.png and /dev/null differ
diff --git a/res/layout/chatlist_cell.xml b/res/layout/chatlist_cell.xml
index 0848bbd95..a3dddc2be 100644
--- a/res/layout/chatlist_cell.xml
+++ b/res/layout/chatlist_cell.xml
@@ -47,6 +47,7 @@
     
 	<TextView 
 	    android:id="@+id/sipUri"
+	    android:lines="1"
 	    android:layout_centerVertical="true"
 	    android:layout_width="match_parent"
 	    android:layout_height="wrap_content"
diff --git a/res/layout/contact_control_row.xml b/res/layout/contact_control_row.xml
index 3a17fba19..0d749be41 100644
--- a/res/layout/contact_control_row.xml
+++ b/res/layout/contact_control_row.xml
@@ -8,6 +8,7 @@
    
    	<TextView 
    	    android:id="@+id/numeroOrAddress"
+	    android:lines="1"
  		android:layout_width="0dp"
  		android:layout_height="wrap_content"
  		android:layout_weight="1"
diff --git a/res/layout/contacts_list.xml b/res/layout/contacts_list.xml
index 554e97191..44e56f100 100644
--- a/res/layout/contacts_list.xml
+++ b/res/layout/contacts_list.xml
@@ -8,7 +8,17 @@
     <LinearLayout 
 	    android:layout_width="match_parent"
 	    android:layout_height="wrap_content"
-	    android:orientation="horizontal">
+	    android:orientation="horizontal"
+	    android:background="@drawable/toolsbar_background">
+	    
+        <TextView 
+            android:visibility="invisible"
+            android:paddingTop="20dp"
+		    android:layout_width="match_parent"
+		    android:layout_height="match_parent"
+		    android:scaleType="centerCrop"
+		    android:adjustViewBounds="true"
+		    android:layout_weight="1"/>
         
         <TextView 
             android:contentDescription="@string/content_description_all_contacts"
diff --git a/res/layout/setup_generic_login.xml b/res/layout/setup_generic_login.xml
index 5e7a0d1fd..d798503a4 100644
--- a/res/layout/setup_generic_login.xml
+++ b/res/layout/setup_generic_login.xml
@@ -67,7 +67,7 @@
             android:background="@drawable/setup_field_background" />
         
         <RelativeLayout
-	    	android:paddingTop="10dp"
+            android:layout_marginTop="10dp"
 		    android:layout_width="match_parent"
 		    android:layout_height="wrap_content">
             
diff --git a/res/layout/setup_linphone_login.xml b/res/layout/setup_linphone_login.xml
index 20697777f..cdf1efaa1 100644
--- a/res/layout/setup_linphone_login.xml
+++ b/res/layout/setup_linphone_login.xml
@@ -54,7 +54,7 @@
             android:background="@drawable/setup_field_background" />
         
         <RelativeLayout
-	    	android:paddingTop="10dp"
+            android:layout_marginTop="10dp"
 		    android:layout_width="match_parent"
 		    android:layout_height="wrap_content">
             
diff --git a/res/layout/setup_wizard.xml b/res/layout/setup_wizard.xml
index 2b71e5803..535d5f573 100644
--- a/res/layout/setup_wizard.xml
+++ b/res/layout/setup_wizard.xml
@@ -128,7 +128,7 @@
         </RelativeLayout>
         
         <RelativeLayout
-	    	android:paddingTop="10dp"
+            android:layout_marginTop="10dp"
 		    android:layout_width="match_parent"
 		    android:layout_height="wrap_content">
             
diff --git a/src/org/linphone/LinphoneUtils.java b/src/org/linphone/LinphoneUtils.java
index f080c300a..8304fd699 100644
--- a/src/org/linphone/LinphoneUtils.java
+++ b/src/org/linphone/LinphoneUtils.java
@@ -65,11 +65,11 @@ public final class LinphoneUtils {
 	private static boolean preventVolumeBarToDisplay = false;
 
 	public static boolean isSipAddress(String numberOrAddress) {
-		return numberOrAddress != null && numberOrAddress.matches("^(sip:)?[a-z0-9]+([_\\.-][a-z0-9]+)*@([a-z0-9]+([\\.-][a-z0-9]+)*)+\\.[a-z]{2,}$");
+		return numberOrAddress != null && numberOrAddress.matches("^(sip:)?(\\+)?[a-z0-9]+([_\\.-][a-z0-9]+)*@([a-z0-9]+([\\.-][a-z0-9]+)*)+\\.[a-z]{2,}$");
 	}
 	
 	public static boolean isStrictSipAddress(String numberOrAddress) {
-		return numberOrAddress != null && numberOrAddress.matches("^sip:[a-z0-9]+([_\\.-][a-z0-9]+)*@([a-z0-9]+([\\.-][a-z0-9]+)*)+\\.[a-z]{2,}$");
+		return numberOrAddress != null && numberOrAddress.matches("^sip:(\\+)?[a-z0-9]+([_\\.-][a-z0-9]+)*@([a-z0-9]+([\\.-][a-z0-9]+)*)+\\.[a-z]{2,}$");
 	}
 	
 	public static String getUsernameFromAddress(String address) {