--- a/res/layout/create_account.xml	Mon Jun 01 17:02:50 2009 +0200
+++ b/res/layout/create_account.xml	Mon Jun 01 20:47:46 2009 +0200
@@ -15,7 +15,8 @@
     		style="@style/Label" />
 		<EditText android:id="@+id/create_account_username"
 			android:layout_width="fill_parent"
-			android:layout_height="wrap_content" />
+			android:layout_height="wrap_content"
+			android:singleLine="true" />
     	<TextView android:id="@+id/create_account_label_password"
     		android:layout_width="fill_parent"
     		android:layout_height="wrap_content"
@@ -24,7 +25,8 @@
 		<EditText android:id="@+id/create_account_password"
 			android:layout_width="fill_parent"
 			android:layout_height="wrap_content"
-			android:password="true" />
+			android:password="true"
+			android:singleLine="true" />
     	<TextView android:id="@+id/create_account_label_confirm_password"
     		android:layout_width="fill_parent"
     		android:layout_height="wrap_content"
@@ -33,7 +35,8 @@
 		<EditText android:id="@+id/create_account_confirm_password"
 			android:layout_width="fill_parent"
 			android:layout_height="wrap_content"
-			android:password="true" />
+			android:password="true"
+			android:singleLine="true" />
     	<View
     		android:layout_height="21dp"
     		android:layout_width="fill_parent" />

--- a/res/layout/edit_settings.xml	Mon Jun 01 17:02:50 2009 +0200
+++ b/res/layout/edit_settings.xml	Mon Jun 01 20:47:46 2009 +0200
@@ -33,7 +33,8 @@
 				<EditText android:id="@+id/settings_account_username"
 					android:layout_width="fill_parent"
 					android:layout_height="wrap_content"
-					android:layout_below="@id/settings_account_label_username" />
+					android:layout_below="@id/settings_account_label_username"
+					android:singleLine="true" />
     			<TextView android:id="@+id/settings_account_label_password"
     				android:layout_width="fill_parent"
     				android:layout_height="wrap_content"
@@ -44,7 +45,8 @@
 					android:layout_width="fill_parent"
 					android:layout_height="wrap_content"
 					android:layout_below="@id/settings_account_label_password"
-					android:password="true" />
+					android:password="true"
+					android:singleLine="true" />
     			<Button android:id="@+id/settings_account_button_save"
 					android:layout_width="wrap_content"
 					android:layout_height="wrap_content"
@@ -88,14 +90,17 @@
 						<EditText android:id="@+id/settings_xmpp_server"
 							android:layout_column="1"
 							android:layout_width="wrap_content"
-							android:layout_height="wrap_content" />
+							android:layout_height="wrap_content"
+							android:maxWidth="223dp"
+							android:singleLine="true" />
 						<EditText android:id="@+id/settings_xmpp_port"
 							android:layout_column="2"
 							android:layout_width="wrap_content"
 							android:layout_height="wrap_content"
 							android:minWidth="77dp"
 							android:numeric="integer"
-							android:maxLength="5" />
+							android:maxLength="5"
+							android:singleLine="true" />
 					</TableRow>
 				</TableLayout>
     			<CheckBox android:id="@+id/settings_xmpp_use_tls"
@@ -160,14 +165,17 @@
 							<EditText android:id="@+id/settings_proxy_server"
 								android:layout_column="1"
 								android:layout_width="wrap_content"
-								android:layout_height="wrap_content" />
+								android:layout_height="wrap_content"
+    							android:maxWidth="223dp"
+								android:singleLine="true" />
 							<EditText android:id="@+id/settings_proxy_port"
 								android:layout_column="2"
 								android:layout_width="wrap_content"
 								android:layout_height="wrap_content"
 								android:minWidth="77dp"
 								android:numeric="integer"
-								android:maxLength="5" />
+								android:maxLength="5"
+								android:singleLine="true" />
 						</TableRow>
 					</TableLayout>
      				<TextView android:id="@+id/settings_proxy_label_username"