diff -r cc21283865ad -r b74384311dee res/layout/contactlistsettings.xml
--- a/res/layout/contactlistsettings.xml	Wed May 20 23:26:07 2009 +0200
+++ b/res/layout/contactlistsettings.xml	Thu May 21 15:41:11 2009 +0200
@@ -8,9 +8,8 @@
 		<TextView android:layout_width="fill_parent"
 			android:layout_height="wrap_content" android:text="@string/CLSServerConnection"
 			android:textSize="18sp" />
-		<LinearLayout
-			android:orientation="horizontal" android:layout_width="fill_parent"
-			android:layout_height="wrap_content">
+		<LinearLayout android:orientation="horizontal"
+			android:layout_width="fill_parent" android:layout_height="wrap_content">
 			<TextView android:layout_width="wrap_content"
 				android:layout_height="wrap_content" android:text="@string/CLSUserid"
 				android:minWidth="90dp" android:textSize="14sp" />
@@ -20,33 +19,8 @@
 				android:scrollHorizontally="true" />
 		</LinearLayout>
 
-		<LinearLayout
-			android:orientation="horizontal" android:layout_width="fill_parent"
-			android:layout_height="wrap_content">
-			<TextView android:layout_width="wrap_content"
-				android:layout_height="wrap_content" android:text="@string/CLSPassword"
-				android:minWidth="90dp" android:textSize="14sp" />
-			<EditText android:id="@+id/password" android:layout_width="fill_parent"
-				android:layout_height="wrap_content" android:singleLine="true"
-				android:password="true" android:textSize="14sp" android:autoText="false"
-				android:capitalize="none" android:scrollHorizontally="true" />
-		</LinearLayout>
-
-		<LinearLayout
-			android:orientation="horizontal" android:layout_width="fill_parent"
-			android:layout_height="wrap_content">
-			<TextView android:layout_width="wrap_content"
-				android:layout_height="wrap_content" android:text="@string/CLSService"
-				android:minWidth="90dp" android:textSize="14sp" />
-			<EditText android:id="@+id/service" android:layout_width="fill_parent"
-				android:layout_height="wrap_content" android:singleLine="true"
-				android:textSize="14sp" android:autoText="false" android:capitalize="none"
-				android:scrollHorizontally="true" />
-		</LinearLayout>
-
-		<LinearLayout
-			android:orientation="horizontal" android:layout_width="fill_parent"
-			android:layout_height="wrap_content">
+		<LinearLayout android:orientation="horizontal"
+			android:layout_width="fill_parent" android:layout_height="wrap_content">
 			<TextView android:layout_width="wrap_content"
 				android:layout_height="wrap_content" android:text="@string/CLSHostPort"
 				android:minWidth="90dp" android:textSize="14sp" />
@@ -60,6 +34,17 @@
 				android:layout_weight="3" android:scrollHorizontally="true" />
 		</LinearLayout>
 
+		<LinearLayout android:orientation="horizontal"
+			android:layout_width="fill_parent" android:layout_height="wrap_content">
+			<TextView android:layout_width="wrap_content"
+				android:layout_height="wrap_content" android:text="@string/CLSPassword"
+				android:minWidth="90dp" android:textSize="14sp" />
+			<EditText android:id="@+id/password" android:layout_width="fill_parent"
+				android:layout_height="wrap_content" android:singleLine="true"
+				android:password="true" android:textSize="14sp" android:autoText="false"
+				android:capitalize="none" android:scrollHorizontally="true" />
+		</LinearLayout>
+
 		<TextView android:layout_width="fill_parent"
 			android:layout_height="wrap_content" android:text=""
 			android:textSize="18sp" />
@@ -92,9 +77,8 @@
 					android:scrollHorizontally="true" />
 			</LinearLayout>
 
-			<LinearLayout
-				android:orientation="horizontal" android:layout_width="fill_parent"
-				android:layout_height="wrap_content">
+			<LinearLayout android:orientation="horizontal"
+				android:layout_width="fill_parent" android:layout_height="wrap_content">
 				<TextView android:layout_width="wrap_content"
 					android:layout_height="wrap_content" android:text="@string/CLSLogin"
 					android:minWidth="90dp" android:textSize="14sp" />
@@ -104,9 +88,8 @@
 					android:capitalize="none" android:scrollHorizontally="true" />
 			</LinearLayout>
 
-			<LinearLayout
-				android:orientation="horizontal" android:layout_width="fill_parent"
-				android:layout_height="wrap_content">
+			<LinearLayout android:orientation="horizontal"
+				android:layout_width="fill_parent" android:layout_height="wrap_content">
 				<TextView android:layout_width="wrap_content"
 					android:layout_height="wrap_content" android:text="@string/CLSPassword"
 					android:minWidth="90dp" android:textSize="14sp" />