diff --git a/res/layout-sw600dp/account_setup_basics_common.xml b/res/layout-sw600dp/account_setup_basics_common.xml
index 376a55783..aed76a6ec 100644
--- a/res/layout-sw600dp/account_setup_basics_common.xml
+++ b/res/layout-sw600dp/account_setup_basics_common.xml
@@ -50,6 +50,7 @@
android:id="@+id/account_email"
android:layout_width="@dimen/setup_credentials_input_width"
android:layout_height="wrap_content"
+ android:contentDescription="@string/account_setup_basics_email_label"
android:inputType="textEmailAddress"
android:imeOptions="actionNext" />
@@ -64,6 +65,7 @@
android:id="@+id/account_password"
android:layout_height="wrap_content"
android:layout_width="@dimen/setup_credentials_input_width"
+ android:contentDescription="@string/account_setup_basics_password_label"
android:inputType="textPassword"
android:imeOptions="actionDone"
android:nextFocusDown="@+id/next" />
diff --git a/res/layout-sw600dp/account_setup_names_common.xml b/res/layout-sw600dp/account_setup_names_common.xml
index c7667dd4b..4f4c7c9c7 100644
--- a/res/layout-sw600dp/account_setup_names_common.xml
+++ b/res/layout-sw600dp/account_setup_names_common.xml
@@ -21,8 +21,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingLeft="@dimen/setup_item_inset_left"
- android:paddingRight="@dimen/setup_item_inset_right"
- >
+ android:paddingRight="@dimen/setup_item_inset_right" >
diff --git a/res/layout-sw600dp/message_view_fragment.xml b/res/layout-sw600dp/message_view_fragment.xml
index 9162a9365..0af6f71ea 100644
--- a/res/layout-sw600dp/message_view_fragment.xml
+++ b/res/layout-sw600dp/message_view_fragment.xml
@@ -95,6 +95,7 @@
-
+
+ android:layout_width="match_parent"
+ android:contentDescription="@string/account_setup_names_user_name_label"
+ android:inputType="textPersonName"
+ android:imeOptions="actionDone" />