diff -r fd5c328fa330 -r b832216810ae res/layout/contactlistsettings.xml
--- a/res/layout/contactlistsettings.xml	Fri Apr 24 00:20:57 2009 +0200
+++ b/res/layout/contactlistsettings.xml	Fri Apr 24 11:51:54 2009 +0200
@@ -2,90 +2,22 @@
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
 	android:orientation="vertical" android:layout_width="fill_parent"
 	android:layout_height="fill_parent">
-<LinearLayout
-	android:orientation="vertical" android:layout_width="fill_parent"
-	android:layout_height="fill_parent">
-
-	<TextView android:layout_width="fill_parent"
-		android:layout_height="wrap_content" android:text="Server connection"
-		android:textSize="18sp" />
-
-	<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-		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="Host/Port:"
-			android:minWidth="90dp" android:textSize="14sp" />
-		<EditText android:id="@+id/host" android:layout_width="fill_parent"
-			android:layout_height="wrap_content" android:singleLine="true"
-			android:textSize="14sp" android:autoText="false" android:capitalize="none"
-			android:layout_weight="2" android:scrollHorizontally="true" />
-		<EditText android:id="@+id/port" android:layout_width="fill_parent"
-			android:layout_height="wrap_content" android:singleLine="true"
-			android:textSize="14sp" android:autoText="false" android:capitalize="none"
-			android:layout_weight="3" android:scrollHorizontally="true" />
-	</LinearLayout>
-
-	<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-		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="Userid:"
-			android:minWidth="90dp" android:textSize="14sp" />
-		<EditText android:id="@+id/userid" 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 xmlns:android="http://schemas.android.com/apk/res/android"
-		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="Password:"
-			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>
-
-	<Spinner android:id="@+id/proxy_type" android:layout_width="fill_parent"
-		android:layout_height="wrap_content" />
-
-	<LinearLayout android:id="@+id/proxy_layout"
-		android:orientation="vertical" android:layout_width="fill_parent"
-		android:layout_height="wrap_content">
+	<LinearLayout android:orientation="vertical"
+		android:layout_width="fill_parent" android:layout_height="fill_parent">
 
 		<TextView android:layout_width="fill_parent"
-			android:layout_height="wrap_content" android:text="Proxy informations"
+			android:layout_height="wrap_content" android:text="Server connection"
 			android:textSize="18sp" />
-
-		<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="Host/Port:"
-				android:minWidth="90dp" android:textSize="14sp" />
-			<EditText android:id="@+id/proxy_host" android:layout_width="fill_parent"
-				android:layout_height="wrap_content" android:singleLine="true"
-				android:textSize="14sp" android:autoText="false" android:capitalize="none"
-				android:layout_weight="2" android:scrollHorizontally="true" />
-			<EditText android:id="@+id/proxy_port" android:layout_width="fill_parent"
-				android:layout_height="wrap_content" android:singleLine="true"
-				android:textSize="14sp" android:autoText="false" android:capitalize="none"
-				android:layout_weight="3" android:scrollHorizontally="true" />
-		</LinearLayout>
-
 		<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
 			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="Login :"
+				android:layout_height="wrap_content" android:text="Userid:"
 				android:minWidth="90dp" android:textSize="14sp" />
-			<EditText android:id="@+id/proxy_login"
-				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" />
+			<EditText android:id="@+id/userid" 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 xmlns:android="http://schemas.android.com/apk/res/android"
@@ -94,23 +26,100 @@
 			<TextView android:layout_width="wrap_content"
 				android:layout_height="wrap_content" android:text="Password:"
 				android:minWidth="90dp" android:textSize="14sp" />
-			<EditText android:id="@+id/proxy_pwd" android:layout_width="fill_parent"
+			<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>
+
+		<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+			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="Service:"
+				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 xmlns:android="http://schemas.android.com/apk/res/android"
+			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="Host/Port:"
+				android:minWidth="90dp" android:textSize="14sp" />
+			<EditText android:id="@+id/host" android:layout_width="fill_parent"
+				android:layout_height="wrap_content" android:singleLine="true"
+				android:textSize="14sp" android:autoText="false" android:capitalize="none"
+				android:layout_weight="2" android:scrollHorizontally="true" />
+			<EditText android:id="@+id/port" android:layout_width="fill_parent"
+				android:layout_height="wrap_content" android:singleLine="true"
+				android:textSize="14sp" android:autoText="false" android:capitalize="none"
+				android:layout_weight="3" android:scrollHorizontally="true" />
+		</LinearLayout>
+
+		<TextView android:layout_width="fill_parent"
+			android:layout_height="wrap_content" android:text="Proxy informations"
+			android:textSize="18sp" />
+
+		<Spinner android:id="@+id/proxy_type" android:layout_width="fill_parent"
+			android:layout_height="wrap_content" />
+
+		<LinearLayout android:id="@+id/proxy_layout"
+			android:orientation="vertical" android:layout_width="fill_parent"
+			android:layout_height="0sp">
+
+			<TextView android:layout_width="fill_parent"
+				android:layout_height="wrap_content" android:text="Proxy informations"
+				android:textSize="18sp" />
 
-	<Button android:id="@+id/ok" android:layout_width="wrap_content"
-		android:layout_height="wrap_content" android:layout_gravity="center_horizontal"
-		android:text="OK">
-		<requestFocus />
-	</Button>
-		<Button android:id="@+id/reconnect" android:layout_width="wrap_content"
-		android:layout_height="wrap_content" android:layout_gravity="center_horizontal"
-		android:text="Reconnect">
-		<requestFocus />
-	</Button>
+			<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="Host/Port:"
+					android:minWidth="90dp" android:textSize="14sp" />
+				<EditText android:id="@+id/proxy_host"
+					android:layout_width="fill_parent" android:layout_height="wrap_content"
+					android:singleLine="true" android:textSize="14sp" android:autoText="false"
+					android:capitalize="none" android:layout_weight="2"
+					android:scrollHorizontally="true" />
+				<EditText android:id="@+id/proxy_port"
+					android:layout_width="fill_parent" android:layout_height="wrap_content"
+					android:singleLine="true" android:textSize="14sp" android:autoText="false"
+					android:capitalize="none" android:layout_weight="3"
+					android:scrollHorizontally="true" />
+			</LinearLayout>
 
-</LinearLayout>
+			<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+				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="Login :"
+					android:minWidth="90dp" android:textSize="14sp" />
+				<EditText android:id="@+id/proxy_login"
+					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 xmlns:android="http://schemas.android.com/apk/res/android"
+				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="Password:"
+					android:minWidth="90dp" android:textSize="14sp" />
+				<EditText android:id="@+id/proxy_pwd" 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>
+		<Button android:id="@+id/ok" android:layout_width="fill_parent"
+			android:layout_height="wrap_content" android:layout_gravity="center_horizontal"
+			android:text="OK">
+			<requestFocus />
+		</Button>
+	</LinearLayout>
 </ScrollView>
\ No newline at end of file