diff -r c88a6d0911ad -r 6dd33a633ddc res/layout/chat.xml
--- a/res/layout/chat.xml	Fri Jan 22 19:47:10 2010 +0100
+++ b/res/layout/chat.xml	Fri Jan 22 19:59:57 2010 +0100
@@ -2,25 +2,26 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	android:layout_width="fill_parent" android:layout_height="fill_parent"
 	android:orientation="vertical">
-	<RelativeLayout android:id="@+id/chat_header"
+	<LinearLayout android:id="@+id/chat_header"
 		android:layout_width="fill_parent" android:layout_height="wrap_content"
+		android:orientation="horizontal" android:gravity="center_vertical"
 		android:background="#222222" android:padding="4px">
 		<ImageView android:id="@+id/chat_contact_status_icon"
 			android:adjustViewBounds="true" android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:layout_centerVertical="true" />
-		<TextView android:id="@+id/chat_contact_name"
+			android:layout_height="wrap_content" android:gravity="center_vertical" />
+		<LinearLayout android:orientation="vertical"
 			android:layout_width="fill_parent" android:layout_height="wrap_content"
-			android:layout_toRightOf="@id/chat_contact_status_icon"
-			android:layout_marginLeft="15sp"
-			android:lines="1" android:singleLine="true" android:textSize="16sp"
-			android:textStyle="bold" android:textColor="#FFFFFF" />
-		<TextView android:id="@+id/chat_contact_status_msg"
-			android:layout_width="fill_parent" android:layout_height="wrap_content"
-			android:layout_below="@id/chat_contact_name" android:layout_alignLeft="@id/chat_contact_name"
-			android:autoLink="all" android:textSize="12sp" android:textColor="#FFFFFF"
-			android:textColorLink="#FFFFFF" />
-	</RelativeLayout>
+			android:paddingLeft="15sp">
+			<TextView android:id="@+id/chat_contact_name"
+				android:layout_width="fill_parent" android:layout_height="wrap_content"
+				android:lines="1" android:singleLine="true" android:textSize="16sp"
+				android:textStyle="bold" android:textColor="#FFFFFF" />
+			<TextView android:id="@+id/chat_contact_status_msg"
+				android:layout_width="fill_parent" android:layout_height="wrap_content"
+				android:autoLink="all" android:textSize="12sp" android:textColor="#FFFFFF"
+				android:textColorLink="#FFFFFF" />
+		</LinearLayout>
+	</LinearLayout>
 	<View android:layout_width="fill_parent" android:layout_height="2dp"
 		android:fadingEdge="horizontal" android:background="#555555" />
 	<ListView android:id="@+id/chat_messages"
@@ -31,7 +32,7 @@
 	<LinearLayout android:layout_width="fill_parent"
 		android:layout_height="wrap_content" android:orientation="horizontal"
 		android:background="#222222" android:padding="8px">
-		<EditText android:id="@+id/chat_input" android:layout_width="0dip"
+		<EditText android:id="@+id/chat_input" android:layout_width="wrap_content"
 			android:layout_height="fill_parent" android:layout_weight="1"
 			android:maxLines="5"
 			android:inputType="textShortMessage|textAutoCorrect|textMultiLine"