diff --git a/res/layout/account_setup_exchange.xml b/res/layout/account_setup_exchange.xml
index 2a6c65124..70ea7500f 100644
--- a/res/layout/account_setup_exchange.xml
+++ b/res/layout/account_setup_exchange.xml
@@ -18,6 +18,7 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
+    android:fillViewport="true"
     android:scrollbarStyle="outsideInset">
     <LinearLayout
         android:layout_width="fill_parent"
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 0109d31bf..88c5c767c 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -298,7 +298,7 @@
     <!-- On "Exchange" setup screen, the name of the server -->
     <string name="account_setup_exchange_server_label">Exchange Server</string>
     <!-- On "Exchange" setup screen, the domain name label -->
-    <string name="account_setup_exchange_domain_label">Domain:</string>
+    <string name="account_setup_exchange_domain_label">Domain</string>
     <!-- On "Exchange" setup screen, the domain name hint -->
     <string name="account_setup_exchange_domain_hint">Enter domain here</string>
     <!-- On "Exchange" setup screen, the use-SSL checkbox label -->