diff --git a/res/layout/account_setup_basics.xml b/res/layout/account_setup_basics.xml
index 4d7129373..2c4028414 100644
--- a/res/layout/account_setup_basics.xml
+++ b/res/layout/account_setup_basics.xml
@@ -29,7 +29,6 @@
         android:id="@+id/account_password"
         android:inputType="textPassword"
         android:hint="@string/account_setup_basics_password_hint"
-        android:password="true"
         android:singleLine="true"
         android:layout_height="wrap_content"
         android:layout_width="fill_parent"
diff --git a/res/layout/account_setup_incoming.xml b/res/layout/account_setup_incoming.xml
index fa2b70122..94b584dab 100644
--- a/res/layout/account_setup_incoming.xml
+++ b/res/layout/account_setup_incoming.xml
@@ -37,7 +37,6 @@
             android:textColor="?android:attr/textColorPrimary" />
         <EditText
             android:id="@+id/account_password"
-            android:password="true"
             android:inputType="textPassword"
             android:singleLine="true"
             android:layout_height="wrap_content"
diff --git a/res/layout/account_setup_outgoing.xml b/res/layout/account_setup_outgoing.xml
index 5952029f5..cc0a813ea 100644
--- a/res/layout/account_setup_outgoing.xml
+++ b/res/layout/account_setup_outgoing.xml
@@ -96,7 +96,6 @@
                 android:textColor="?android:attr/textColorPrimary" />
             <EditText
                 android:id="@+id/account_password"
-                android:password="true"
                 android:singleLine="true"
                 android:inputType="textPassword"
                 android:layout_height="wrap_content"
diff --git a/res/layout/message_compose.xml b/res/layout/message_compose.xml
index d0ef2f14a..27db74db1 100644
--- a/res/layout/message_compose.xml
+++ b/res/layout/message_compose.xml
@@ -235,10 +235,7 @@
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
                 android:gravity="top"
-                android:editable="false"
                 android:minLines="0"
-                android:autoText="true"
-                android:capitalize="sentences"
                 android:hint="@string/message_compose_signature_hint"
                 android:inputType="textMultiLine|textAutoCorrect|textCapSentences"
                 android:textAppearance="?android:attr/textAppearanceMedium" />
@@ -265,8 +262,6 @@
                     android:layout_height="wrap_content"
                     android:gravity="top"
                     android:minLines="3"
-                    android:autoText="true"
-                    android:capitalize="sentences"
                     android:inputType="textMultiLine|textAutoCorrect|textCapSentences"
                     android:textAppearance="?android:attr/textAppearanceMedium" />
 
@@ -307,10 +302,7 @@
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
                 android:gravity="top"
-                android:editable="false"
                 android:minLines="0"
-                android:autoText="true"
-                android:capitalize="sentences"
                 android:hint="@string/message_compose_signature_hint"
                 android:inputType="textMultiLine|textAutoCorrect|textCapSentences"
                 android:textAppearance="?android:attr/textAppearanceMedium" />