diff -r da650185bf8b -r fd6c52c23165 res/layout/chat.xml
--- a/res/layout/chat.xml	Sun Nov 15 18:35:52 2009 +0100
+++ b/res/layout/chat.xml	Sun Nov 15 20:40:15 2009 +0100
@@ -3,9 +3,9 @@
 	android:layout_width="fill_parent" android:layout_height="fill_parent"
 	android:orientation="vertical">
 	<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">
+		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:gravity="center_vertical" />
@@ -25,13 +25,20 @@
 	<View android:layout_width="fill_parent" android:layout_height="2dp"
 		android:fadingEdge="horizontal" android:background="#555555" />
 	<ListView android:id="@+id/chat_messages"
-		android:layout_width="fill_parent"
-		android:layout_height="0px" android:layout_weight="1"
-		android:transcriptMode="normal" android:fastScrollEnabled="true"
-		android:smoothScrollbar="false" android:layout_marginBottom="20sp"
-		android:padding="4px" />
-	<EditText android:id="@+id/chat_input" android:layout_width="fill_parent"
-		android:layout_height="wrap_content" android:inputType="textShortMessage|textAutoComplete"
-		android:imeOptions="actionSend" android:cursorVisible="true"
-		android:hint="@string/chat_input_default_value" />
+		android:layout_width="fill_parent" android:layout_height="0px"
+		android:layout_weight="1" android:transcriptMode="normal"
+		android:fastScrollEnabled="true" android:smoothScrollbar="false"
+		android:layout_marginBottom="20sp" android:padding="4px" />
+	<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="wrap_content"
+			android:layout_height="fill_parent" android:layout_weight="1"
+			android:ellipsize="end" android:inputType="textAutoComplete|textAutoCorrect"
+			android:imeOptions="actionSend" android:cursorVisible="true"
+			android:hint="@string/chat_input_default_value" />
+		<Button android:id="@+id/chat_send_message"
+			android:layout_width="wrap_content" android:layout_height="fill_parent"
+			android:text="@string/chat_send_message" />
+	</LinearLayout>
 </LinearLayout>