diff --git a/app/build.gradle b/app/build.gradle
index 3d9be7ccb1..9393bd9bf5 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -4,7 +4,7 @@ apply plugin: 'kotlin-android'
 apply plugin: 'de.undercouch.download'
 
 def getVersionCode = { -> return 1989 }
-def getRevision = { -> return "a" }
+def getRevision = { -> return "b" }
 def getReleaseName = { -> return "Mei long" }
 // https://en.wikipedia.org/wiki/List_of_dinosaur_genera
 
diff --git a/app/src/main/java/eu/faircode/email/StyleHelper.java b/app/src/main/java/eu/faircode/email/StyleHelper.java
index cd85e841ae..2333121aca 100644
--- a/app/src/main/java/eu/faircode/email/StyleHelper.java
+++ b/app/src/main/java/eu/faircode/email/StyleHelper.java
@@ -55,11 +55,13 @@ import android.text.style.URLSpan;
 import android.text.style.UnderlineSpan;
 import android.util.Base64;
 import android.util.Pair;
+import android.view.KeyEvent;
 import android.view.LayoutInflater;
 import android.view.MenuItem;
 import android.view.SubMenu;
 import android.view.View;
 import android.view.WindowManager;
+import android.view.inputmethod.EditorInfo;
 import android.widget.Button;
 import android.widget.EditText;
 import android.widget.TextView;
@@ -678,6 +680,17 @@ public class StyleHelper {
                         tilPassword2.getEditText().addTextChangedListener(w);
                         w.afterTextChanged(null);
 
+                        tilPassword2.getEditText().setOnEditorActionListener(new TextView.OnEditorActionListener() {
+                            @Override
+                            public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
+                                if (actionId == EditorInfo.IME_ACTION_DONE) {
+                                    btnOk.performClick();
+                                    return true;
+                                } else
+                                    return false;
+                            }
+                        });
+
                         return true;
                     }