diff --git a/app/src/main/java/eu/faircode/email/FragmentCompose.java b/app/src/main/java/eu/faircode/email/FragmentCompose.java
index fac4d3b01f..9fffccd7f1 100644
--- a/app/src/main/java/eu/faircode/email/FragmentCompose.java
+++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java
@@ -266,6 +266,18 @@ public class FragmentCompose extends FragmentBase {
             }
         });
 
+        etTo.setMaxLines(Integer.MAX_VALUE);
+        etTo.setHorizontallyScrolling(false);
+
+        etCc.setMaxLines(Integer.MAX_VALUE);
+        etCc.setHorizontallyScrolling(false);
+
+        etBcc.setMaxLines(Integer.MAX_VALUE);
+        etBcc.setHorizontallyScrolling(false);
+
+        etSubject.setMaxLines(Integer.MAX_VALUE);
+        etSubject.setHorizontallyScrolling(false);
+
         View.OnClickListener onPick = new View.OnClickListener() {
             @Override
             public void onClick(View view) {
diff --git a/app/src/main/java/eu/faircode/email/FragmentQuickSetup.java b/app/src/main/java/eu/faircode/email/FragmentQuickSetup.java
index 5e1455bb36..1269a263cf 100644
--- a/app/src/main/java/eu/faircode/email/FragmentQuickSetup.java
+++ b/app/src/main/java/eu/faircode/email/FragmentQuickSetup.java
@@ -38,12 +38,14 @@ import android.text.TextUtils;
 import android.text.TextWatcher;
 import android.text.method.LinkMovementMethod;
 import android.util.Patterns;
+import android.view.KeyEvent;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
+import android.view.inputmethod.EditorInfo;
 import android.widget.Button;
 import android.widget.EditText;
 import android.widget.TextView;
@@ -149,6 +151,16 @@ public class FragmentQuickSetup extends FragmentBase {
 
         tilPassword.setHintEnabled(false);
 
+        tilPassword.getEditText().setOnEditorActionListener(new TextView.OnEditorActionListener() {
+            @Override
+            public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
+                if (actionId == EditorInfo.IME_ACTION_GO) {
+                    onSave(true);
+                    return true;
+                }
+                return false;
+            }
+        });
         btnCheck.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
diff --git a/app/src/main/res/layout/dialog_html.xml b/app/src/main/res/layout/dialog_html.xml
index 5c9ccd56d1..0a001da74e 100644
--- a/app/src/main/res/layout/dialog_html.xml
+++ b/app/src/main/res/layout/dialog_html.xml
@@ -13,6 +13,7 @@
         android:fontFamily="monospace"
         android:gravity="top"
         android:hint="@string/title_edit_html"
+        android:imeOptions="actionDone"
         android:inputType="text|textMultiLine"
         android:minHeight="120dp"
         android:textAppearance="@style/TextAppearance.AppCompat.Medium"
diff --git a/app/src/main/res/layout/dialog_keyword.xml b/app/src/main/res/layout/dialog_keyword.xml
index 6dceddd018..0fdd36b148 100644
--- a/app/src/main/res/layout/dialog_keyword.xml
+++ b/app/src/main/res/layout/dialog_keyword.xml
@@ -18,8 +18,9 @@
         android:id="@+id/etKeyword"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:text="Keyword"
+        android:imeOptions="actionDone"
         android:inputType="text"
+        android:text="Keyword"
         android:textAppearance="@style/TextAppearance.AppCompat.Medium"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/tvKeyword" />
diff --git a/app/src/main/res/layout/dialog_link.xml b/app/src/main/res/layout/dialog_link.xml
index 8e86fdaf94..efdf37fd45 100644
--- a/app/src/main/res/layout/dialog_link.xml
+++ b/app/src/main/res/layout/dialog_link.xml
@@ -19,6 +19,7 @@
         android:id="@+id/etLink"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:imeOptions="actionDone"
         android:inputType="textUri|textMultiLine"
         android:text="https://email.faircode.eu/"
         android:textAppearance="@style/TextAppearance.AppCompat.Small"
diff --git a/app/src/main/res/layout/dialog_password.xml b/app/src/main/res/layout/dialog_password.xml
index f544dfe01b..e8bac31038 100644
--- a/app/src/main/res/layout/dialog_password.xml
+++ b/app/src/main/res/layout/dialog_password.xml
@@ -18,6 +18,7 @@
             android:layout_height="wrap_content"
             android:autofillHints="password"
             android:hint="@string/title_setup_password"
+            android:imeOptions="actionNext"
             android:inputType="textPassword"
             android:textAppearance="@style/TextAppearance.AppCompat.Medium" />
     </com.google.android.material.textfield.TextInputLayout>
@@ -35,6 +36,7 @@
             android:layout_height="wrap_content"
             android:autofillHints="password"
             android:hint="@string/title_setup_password_repeat"
+            android:imeOptions="actionDone"
             android:inputType="textPassword"
             android:textAppearance="@style/TextAppearance.AppCompat.Medium" />
     </com.google.android.material.textfield.TextInputLayout>
diff --git a/app/src/main/res/layout/fragment_answer.xml b/app/src/main/res/layout/fragment_answer.xml
index dcc7c6bb4f..2e6472091b 100644
--- a/app/src/main/res/layout/fragment_answer.xml
+++ b/app/src/main/res/layout/fragment_answer.xml
@@ -12,6 +12,7 @@
         android:layout_marginTop="6dp"
         android:layout_marginEnd="6dp"
         android:hint="@string/title_answer_name"
+        android:imeOptions="actionNext"
         android:inputType="textCapSentences"
         android:textAppearance="@style/TextAppearance.AppCompat.Small"
         app:layout_constraintStart_toStartOf="parent"
@@ -35,6 +36,7 @@
         android:fontFamily="monospace"
         android:gravity="top"
         android:hint="@string/title_answer_text"
+        android:imeOptions="actionDone"
         android:inputType="textCapSentences|textMultiLine"
         android:textAppearance="@style/TextAppearance.AppCompat.Small"
         app:layout_constraintBottom_toTopOf="@+id/vSeparatorHints"
diff --git a/app/src/main/res/layout/fragment_compose.xml b/app/src/main/res/layout/fragment_compose.xml
index 8ea02b5233..692c0a85e8 100644
--- a/app/src/main/res/layout/fragment_compose.xml
+++ b/app/src/main/res/layout/fragment_compose.xml
@@ -54,8 +54,8 @@
                 android:layout_height="wrap_content"
                 android:layout_marginStart="6dp"
                 android:hint="@string/title_to"
-                android:inputType="textEmailAddress|textMultiLine"
-                android:singleLine="true"
+                android:imeOptions="actionNext"
+                android:inputType="textEmailAddress"
                 android:textAppearance="@style/TextAppearance.AppCompat.Medium"
                 app:layout_constraintEnd_toStartOf="@+id/ivToAdd"
                 app:layout_constraintStart_toStartOf="parent"
@@ -79,8 +79,8 @@
                 android:layout_height="wrap_content"
                 android:layout_marginStart="6dp"
                 android:hint="@string/title_cc"
-                android:inputType="textEmailAddress|textMultiLine"
-                android:singleLine="true"
+                android:imeOptions="actionNext"
+                android:inputType="textEmailAddress"
                 android:textAppearance="@style/TextAppearance.AppCompat.Medium"
                 app:layout_constraintEnd_toStartOf="@+id/ivCcAdd"
                 app:layout_constraintStart_toStartOf="parent"
@@ -104,8 +104,8 @@
                 android:layout_height="wrap_content"
                 android:layout_marginStart="6dp"
                 android:hint="@string/title_bcc"
-                android:inputType="textEmailAddress|textMultiLine"
-                android:singleLine="true"
+                android:imeOptions="actionNext"
+                android:inputType="textEmailAddress"
                 android:textAppearance="@style/TextAppearance.AppCompat.Medium"
                 app:layout_constraintEnd_toStartOf="@+id/ivBccAdd"
                 app:layout_constraintStart_toStartOf="parent"
@@ -130,8 +130,8 @@
                 android:layout_marginStart="6dp"
                 android:layout_marginEnd="6dp"
                 android:hint="@string/title_subject"
-                android:inputType="textEmailSubject|textCapSentences|textMultiLine"
-                android:singleLine="true"
+                android:imeOptions="actionNext"
+                android:inputType="textEmailSubject|textCapSentences"
                 android:textAppearance="@style/TextAppearance.AppCompat.Medium"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/fragment_quick_setup.xml b/app/src/main/res/layout/fragment_quick_setup.xml
index 9b10e2fd57..c107644e4f 100644
--- a/app/src/main/res/layout/fragment_quick_setup.xml
+++ b/app/src/main/res/layout/fragment_quick_setup.xml
@@ -18,6 +18,7 @@
             android:layout_height="wrap_content"
             android:autofillHints="name"
             android:hint="@string/title_identity_name"
+            android:imeOptions="actionNext"
             android:inputType="textPersonName"
             android:textAppearance="@style/TextAppearance.AppCompat.Medium"
             app:layout_constraintStart_toStartOf="parent"
@@ -42,6 +43,7 @@
             android:layout_height="wrap_content"
             android:autofillHints="emailAddress"
             android:hint="@string/title_identity_email"
+            android:imeOptions="actionNext"
             android:inputType="textEmailAddress"
             android:textAppearance="@style/TextAppearance.AppCompat.Medium"
             app:layout_constraintStart_toStartOf="parent"
@@ -60,6 +62,7 @@
                 android:layout_height="wrap_content"
                 android:autofillHints="password"
                 android:hint="@string/title_setup_password"
+                android:imeOptions="actionGo"
                 android:inputType="textPassword"
                 android:textAppearance="@style/TextAppearance.AppCompat.Medium" />
         </com.google.android.material.textfield.TextInputLayout>