diff --git a/res/layout/edit_identity.xml b/res/layout/edit_identity.xml
index fd7c99601..7d5684341 100644
--- a/res/layout/edit_identity.xml
+++ b/res/layout/edit_identity.xml
@@ -48,13 +48,13 @@
             android:layout_height="wrap_content"
             android:layout_width="fill_parent" 
             android:hint="@string/edit_identity_email_hint"
-            />
+            android:inputType="textEmailAddress"/>
         <TextView
             android:text="@string/edit_identity_reply_to_label"
             android:layout_height="wrap_content"
             android:layout_width="fill_parent"
             android:textAppearance="?android:attr/textAppearanceSmall"
-            android:textColor="?android:attr/textColorPrimary" 
+            android:textColor="?android:attr/textColorPrimary"
             />
         <EditText
             android:id="@+id/reply_to"
@@ -62,6 +62,7 @@
             android:layout_height="wrap_content"
             android:layout_width="fill_parent" 
             android:hint="@string/edit_identity_reply_to_hint"
+            android:inputType="textEmailAddress"
             />
             <!-- 
         <TextView
@@ -98,6 +99,6 @@
 	            android:layout_height="wrap_content"
 	            android:layout_width="fill_parent" 
 	            android:hint="@string/edit_identity_signature_hint"/>
-    	</LinearLayout>
+    	</LinearLayout>
     </LinearLayout>
 </ScrollView>