diff --git a/res/layout-small/setup_wizard.xml b/res/layout-small/setup_wizard.xml
index dd7d80908..addb837a7 100644
--- a/res/layout-small/setup_wizard.xml
+++ b/res/layout-small/setup_wizard.xml
@@ -78,35 +78,51 @@
 	            android:singleLine="true"
 	            android:textColor="@android:color/black"
             	android:background="@drawable/setup_field_background" />
-	        
-	        <EditText
-            	android:textCursorDrawable="@null"
-	            android:id="@+id/setup_password_confirm"
-	            android:layout_width="match_parent"
-	            android:layout_height="wrap_content"
-	            android:layout_below="@id/setup_password"
-	            android:hint="@string/setup_password_confirm_hint"
-	            android:singleLine="true"
-	            android:lines="1"
-	            android:maxLines="1"
-	            android:inputType="textPassword"
-	            android:paddingLeft="10dp"
-	            android:paddingRight="10dp"
-	            android:ellipsize="end"
-	            android:textColor="@android:color/black"
-            	android:background="@drawable/setup_field_background" />
-	        
-	        <ImageView 
-	    		android:contentDescription="@string/content_description_setup_ok"
-	            android:id="@+id/setup_password_ok"
-	            android:layout_width="wrap_content"
-	            android:layout_height="wrap_content"
-	            android:paddingRight="5dp"
-	            android:layout_alignParentRight="true"
-	            android:layout_centerVertical="true"
-	            android:src="@drawable/wizard_notok"/>
+
+			<ImageView
+				android:contentDescription="@string/content_description_setup_ok"
+				android:id="@+id/setup_password_ok"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:paddingRight="5dp"
+				android:layout_alignParentRight="true"
+				android:layout_centerVertical="true"
+				android:src="@drawable/wizard_notok"/>
         
         </RelativeLayout>
+
+		<RelativeLayout
+			android:layout_marginTop="5dp"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content">
+
+			<EditText
+				android:textCursorDrawable="@null"
+				android:id="@+id/setup_password_confirm"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:hint="@string/setup_password_confirm_hint"
+				android:singleLine="true"
+				android:lines="1"
+				android:maxLines="1"
+				android:inputType="textPassword"
+				android:paddingLeft="10dp"
+				android:paddingRight="10dp"
+				android:ellipsize="end"
+				android:textColor="@android:color/black"
+				android:background="@drawable/setup_field_background" />
+
+			<ImageView
+				android:contentDescription="@string/content_description_setup_ok"
+				android:id="@+id/setup_confirm_password_ok"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:paddingRight="5dp"
+				android:layout_alignParentRight="true"
+				android:layout_centerVertical="true"
+				android:src="@drawable/wizard_notok"/>
+
+		</RelativeLayout>
         
         <RelativeLayout 
            	android:layout_marginTop="5dp"
@@ -159,13 +175,7 @@
 			    android:textColor="@android:color/black"/>
         
         </RelativeLayout>
-        
-        <View
-		    android:layout_width="match_parent"
-		    android:layout_height="match_parent"
-            android:paddingLeft="10dp"
-            android:paddingRight="10dp" />
-        
-    </LinearLayout>
+
+	</LinearLayout>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/src/org/linphone/ContactsManager.java b/src/org/linphone/ContactsManager.java
index 9fbc50d84..1e86f6958 100644
--- a/src/org/linphone/ContactsManager.java
+++ b/src/org/linphone/ContactsManager.java
@@ -593,9 +593,8 @@ public class ContactsManager {
 				c.close();
 				return address;
 			}
+			c.close();
 		}
-
-		c.close();
 		return null;
 	}
 
diff --git a/src/org/linphone/ui/Digit.java b/src/org/linphone/ui/Digit.java
index bd5294cb7..191026039 100644
--- a/src/org/linphone/ui/Digit.java
+++ b/src/org/linphone/ui/Digit.java
@@ -155,8 +155,8 @@ public class Digit extends Button implements AddressAware {
 			if(id == R.id.Digit1 && lc.getCalls().length == 0){
 				String voiceMail = LinphonePreferences.instance().getVoiceMailUri();
 				mAddress.getEditableText().clear();
-				mAddress.getEditableText().append(voiceMail);
 				if(voiceMail != null){
+					mAddress.getEditableText().append(voiceMail);
 					LinphoneManager.getInstance().newOutgoingCall(mAddress);
 				}
 				return true;