diff --git a/app/src/main/java/eu/faircode/email/FragmentCompose.java b/app/src/main/java/eu/faircode/email/FragmentCompose.java
index 0d26a80eb3..fb0ad5188a 100644
--- a/app/src/main/java/eu/faircode/email/FragmentCompose.java
+++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java
@@ -136,9 +136,8 @@ public class FragmentCompose extends FragmentBase {
 
     private ViewGroup view;
     private Spinner spIdentity;
-    private TextView tvExtraPrefix;
     private EditText etExtra;
-    private TextView tvExtraSuffix;
+    private TextView tvDomain;
     private MultiAutoCompleteTextView etTo;
     private ImageView ivToAdd;
     private MultiAutoCompleteTextView etCc;
@@ -193,9 +192,8 @@ public class FragmentCompose extends FragmentBase {
 
         // Get controls
         spIdentity = view.findViewById(R.id.spIdentity);
-        tvExtraPrefix = view.findViewById(R.id.tvExtraPrefix);
         etExtra = view.findViewById(R.id.etExtra);
-        tvExtraSuffix = view.findViewById(R.id.tvExtraSuffix);
+        tvDomain = view.findViewById(R.id.tvDomain);
         etTo = view.findViewById(R.id.etTo);
         ivToAdd = view.findViewById(R.id.ivToAdd);
         etCc = view.findViewById(R.id.etCc);
@@ -228,8 +226,8 @@ public class FragmentCompose extends FragmentBase {
             public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
                 EntityIdentity identity = (EntityIdentity) parent.getAdapter().getItem(position);
                 int at = (identity == null ? -1 : identity.email.indexOf('@'));
-                tvExtraPrefix.setText(at < 0 ? null : identity.email.substring(0, at));
-                tvExtraSuffix.setText(at < 0 ? null : identity.email.substring(at));
+                etExtra.setHint(at < 0 ? null : identity.email.substring(0, at));
+                tvDomain.setText(at < 0 ? null : identity.email.substring(at));
                 Spanned signature = null;
                 if (pro) {
                     if (identity != null && !TextUtils.isEmpty(identity.signature))
@@ -250,8 +248,8 @@ public class FragmentCompose extends FragmentBase {
 
             @Override
             public void onNothingSelected(AdapterView<?> parent) {
-                tvExtraPrefix.setText(null);
-                tvExtraSuffix.setText(null);
+                etExtra.setHint("");
+                tvDomain.setText(null);
                 tvSignature.setText(null);
                 grpSignature.setVisibility(View.GONE);
             }
@@ -375,8 +373,8 @@ public class FragmentCompose extends FragmentBase {
 
         // Initialize
         setSubtitle(R.string.title_compose);
-        tvExtraPrefix.setText(null);
-        tvExtraSuffix.setText(null);
+        etExtra.setHint("");
+        tvDomain.setText(null);
 
         grpHeader.setVisibility(View.GONE);
         grpExtra.setVisibility(View.GONE);
diff --git a/app/src/main/java/eu/faircode/email/MessageHelper.java b/app/src/main/java/eu/faircode/email/MessageHelper.java
index 155842f83d..6e387bd27c 100644
--- a/app/src/main/java/eu/faircode/email/MessageHelper.java
+++ b/app/src/main/java/eu/faircode/email/MessageHelper.java
@@ -207,7 +207,7 @@ public class MessageHelper {
             String name = ((InternetAddress) message.from[0]).getPersonal();
             if (email != null && !TextUtils.isEmpty(message.extra)) {
                 int at = email.indexOf('@');
-                email = email.substring(0, at) + message.extra + email.substring(at);
+                email = message.extra + email.substring(at);
                 Log.i("extra=" + email);
             }
             imessage.setFrom(new InternetAddress(email, name));
diff --git a/app/src/main/res/layout/fragment_compose.xml b/app/src/main/res/layout/fragment_compose.xml
index f563bec6a9..d6fd255c6c 100644
--- a/app/src/main/res/layout/fragment_compose.xml
+++ b/app/src/main/res/layout/fragment_compose.xml
@@ -24,29 +24,20 @@
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent" />
 
-            <TextView
-                android:id="@+id/tvExtraPrefix"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="12dp"
-                android:text="name"
-                android:textAppearance="@style/TextAppearance.AppCompat.Small"
-                app:layout_constraintBottom_toBottomOf="@+id/etExtra"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="@+id/etExtra" />
-
             <EditText
                 android:id="@+id/etExtra"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
+                android:layout_marginStart="6dp"
+                android:hint="name"
                 android:inputType="text"
                 android:textAppearance="@style/TextAppearance.AppCompat.Medium"
-                app:layout_constraintEnd_toStartOf="@+id/tvExtraSuffix"
-                app:layout_constraintStart_toEndOf="@id/tvExtraPrefix"
+                app:layout_constraintEnd_toStartOf="@+id/tvDomain"
+                app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/spIdentity" />
 
             <TextView
-                android:id="@+id/tvExtraSuffix"
+                android:id="@+id/tvDomain"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginEnd="12dp"