diff --git a/res/layout/message_compose.xml b/res/layout/message_compose.xml
index b6ac2da71..18b775573 100644
--- a/res/layout/message_compose.xml
+++ b/res/layout/message_compose.xml
@@ -29,20 +29,11 @@
                     android:layout_width="fill_parent"
                     android:layout_height="wrap_content"
                     android:orientation="horizontal">
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginLeft="6dip"
-                        android:layout_marginRight="6dip"
-                        android:text="@string/send_as"
-                        android:textColor="@android:color/primary_text_light"
-                        android:textAppearance="?android:attr/textAppearanceMedium"/>
-
                     <Button
                         android:id="@+id/identity"
                         android:layout_width="fill_parent"
                         android:layout_height="wrap_content"
+                        android:gravity="left|center"
                         android:layout_marginLeft="6dip"
                         android:layout_marginRight="6dip"/>
 
diff --git a/src/com/fsck/k9/activity/MessageCompose.java b/src/com/fsck/k9/activity/MessageCompose.java
index 01df80ebb..73d367409 100644
--- a/src/com/fsck/k9/activity/MessageCompose.java
+++ b/src/com/fsck/k9/activity/MessageCompose.java
@@ -1868,7 +1868,7 @@ public class MessageCompose extends K9Activity implements OnClickListener, OnFoc
     }
 
     private void updateFrom() {
-        mChooseIdentityButton.setText(getIdentityDescription(mIdentity));
+        mChooseIdentityButton.setText(mIdentity.getEmail());
     }
 
     private void updateSignature() {