diff --git a/app/src/main/java/eu/faircode/email/FragmentAccount.java b/app/src/main/java/eu/faircode/email/FragmentAccount.java
index 6333d3b6..98a12b4c 100644
--- a/app/src/main/java/eu/faircode/email/FragmentAccount.java
+++ b/app/src/main/java/eu/faircode/email/FragmentAccount.java
@@ -66,7 +66,7 @@ public class FragmentAccount extends FragmentEx {
     private TextInputLayout tilPassword;
     private CheckBox cbSynchronize;
     private CheckBox cbPrimary;
-    private Button btnOk;
+    private Button btnSave;
     private ProgressBar pbCheck;
     // TODO: loading spinner
 
@@ -102,7 +102,7 @@ public class FragmentAccount extends FragmentEx {
         tilPassword = view.findViewById(R.id.tilPassword);
         cbSynchronize = view.findViewById(R.id.cbSynchronize);
         cbPrimary = view.findViewById(R.id.cbPrimary);
-        btnOk = view.findViewById(R.id.btnOk);
+        btnSave = view.findViewById(R.id.btnSave);
         pbCheck = view.findViewById(R.id.pbCheck);
 
         // Wire controls
@@ -136,10 +136,10 @@ public class FragmentAccount extends FragmentEx {
             }
         });
 
-        btnOk.setOnClickListener(new View.OnClickListener() {
+        btnSave.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                btnOk.setEnabled(false);
+                btnSave.setEnabled(false);
                 pbCheck.setVisibility(View.VISIBLE);
 
                 Bundle args = new Bundle();
@@ -334,7 +334,7 @@ public class FragmentAccount extends FragmentEx {
         public void onLoadFinished(@NonNull Loader<Throwable> loader, Throwable ex) {
             getLoaderManager().destroyLoader(loader.getId());
 
-            btnOk.setEnabled(true);
+            btnSave.setEnabled(true);
             pbCheck.setVisibility(View.GONE);
 
             if (ex == null)
diff --git a/app/src/main/java/eu/faircode/email/FragmentFolder.java b/app/src/main/java/eu/faircode/email/FragmentFolder.java
index 33f835c1..575bc140 100644
--- a/app/src/main/java/eu/faircode/email/FragmentFolder.java
+++ b/app/src/main/java/eu/faircode/email/FragmentFolder.java
@@ -42,7 +42,7 @@ import android.widget.Toast;
 public class FragmentFolder extends FragmentEx {
     private CheckBox cbSynchronize;
     private EditText etAfter;
-    private Button btnOk;
+    private Button btnSave;
     private ProgressBar pbSave;
     private ProgressBar pbWait;
     private Group grpReady;
@@ -62,14 +62,14 @@ public class FragmentFolder extends FragmentEx {
         cbSynchronize = view.findViewById(R.id.cbSynchronize);
         etAfter = view.findViewById(R.id.etAfter);
         pbSave = view.findViewById(R.id.pbSave);
-        btnOk = view.findViewById(R.id.btnOk);
+        btnSave = view.findViewById(R.id.btnSave);
         pbWait = view.findViewById(R.id.pbWait);
         grpReady = view.findViewById(R.id.grpReady);
 
-        btnOk.setOnClickListener(new View.OnClickListener() {
+        btnSave.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                btnOk.setEnabled(false);
+                btnSave.setEnabled(false);
                 pbSave.setVisibility(View.VISIBLE);
 
                 Bundle args = new Bundle();
@@ -155,7 +155,7 @@ public class FragmentFolder extends FragmentEx {
         public void onLoadFinished(@NonNull Loader<Throwable> loader, Throwable ex) {
             getLoaderManager().destroyLoader(loader.getId());
 
-            btnOk.setEnabled(true);
+            btnSave.setEnabled(true);
             pbSave.setVisibility(View.GONE);
 
             if (ex == null)
diff --git a/app/src/main/java/eu/faircode/email/FragmentIdentity.java b/app/src/main/java/eu/faircode/email/FragmentIdentity.java
index 624b10af..b19227bd 100644
--- a/app/src/main/java/eu/faircode/email/FragmentIdentity.java
+++ b/app/src/main/java/eu/faircode/email/FragmentIdentity.java
@@ -66,7 +66,7 @@ public class FragmentIdentity extends FragmentEx {
     private TextInputLayout tilPassword;
     private CheckBox cbSynchronize;
     private CheckBox cbPrimary;
-    private Button btnOk;
+    private Button btnSave;
     private ProgressBar pbCheck;
     // TODO: loading spinner
 
@@ -97,7 +97,7 @@ public class FragmentIdentity extends FragmentEx {
         tilPassword = view.findViewById(R.id.tilPassword);
         cbSynchronize = view.findViewById(R.id.cbSynchronize);
         cbPrimary = view.findViewById(R.id.cbPrimary);
-        btnOk = view.findViewById(R.id.btnOk);
+        btnSave = view.findViewById(R.id.btnSave);
         pbCheck = view.findViewById(R.id.pbCheck);
 
         // Wire controls
@@ -153,10 +153,10 @@ public class FragmentIdentity extends FragmentEx {
             }
         });
 
-        btnOk.setOnClickListener(new View.OnClickListener() {
+        btnSave.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                btnOk.setEnabled(false);
+                btnSave.setEnabled(false);
                 pbCheck.setVisibility(View.VISIBLE);
 
                 Bundle args = new Bundle();
@@ -284,7 +284,7 @@ public class FragmentIdentity extends FragmentEx {
         public void onLoadFinished(@NonNull Loader<Throwable> loader, Throwable ex) {
             getLoaderManager().destroyLoader(loader.getId());
 
-            btnOk.setEnabled(true);
+            btnSave.setEnabled(true);
             pbCheck.setVisibility(View.GONE);
 
             if (ex == null)
diff --git a/app/src/main/res/layout/fragment_account.xml b/app/src/main/res/layout/fragment_account.xml
index 93aea183..6a9b9bb4 100644
--- a/app/src/main/res/layout/fragment_account.xml
+++ b/app/src/main/res/layout/fragment_account.xml
@@ -177,11 +177,11 @@
             app:layout_constraintTop_toBottomOf="@id/cbSynchronize" />
 
         <Button
-            android:id="@+id/btnOk"
+            android:id="@+id/btnSave"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="12dp"
-            android:text="@android:string/ok"
+            android:text="@string/title_save"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/cbPrimary" />
 
@@ -192,14 +192,14 @@
             android:layout_height="24dp"
             android:layout_marginStart="12dp"
             android:indeterminate="true"
-            app:layout_constraintBottom_toBottomOf="@id/btnOk"
-            app:layout_constraintStart_toEndOf="@id/btnOk"
-            app:layout_constraintTop_toTopOf="@id/btnOk" />
+            app:layout_constraintBottom_toBottomOf="@id/btnSave"
+            app:layout_constraintStart_toEndOf="@id/btnSave"
+            app:layout_constraintTop_toTopOf="@id/btnSave" />
 
         <android.support.constraint.Group
             android:id="@+id/grpReady"
             android:layout_width="0dp"
             android:layout_height="0dp"
-            app:constraint_referenced_ids="spProvider,etName,etHost,etPort,etUser,tilPassword,cbPrimary,cbSynchronize,btnOk" />
+            app:constraint_referenced_ids="spProvider,etName,etHost,etPort,etUser,tilPassword,cbPrimary,cbSynchronize,btnSave" />
     </android.support.constraint.ConstraintLayout>
 </ScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_folder.xml b/app/src/main/res/layout/fragment_folder.xml
index 16938e84..c966dc57 100644
--- a/app/src/main/res/layout/fragment_folder.xml
+++ b/app/src/main/res/layout/fragment_folder.xml
@@ -45,11 +45,11 @@
             app:layout_constraintTop_toBottomOf="@id/tvAfter" />
 
         <Button
-            android:id="@+id/btnOk"
+            android:id="@+id/btnSave"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="12dp"
-            android:text="@android:string/ok"
+            android:text="@string/title_save"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/etAfter" />
 
@@ -60,9 +60,9 @@
             android:layout_height="24dp"
             android:layout_marginStart="12dp"
             android:indeterminate="true"
-            app:layout_constraintBottom_toBottomOf="@id/btnOk"
-            app:layout_constraintStart_toEndOf="@id/btnOk"
-            app:layout_constraintTop_toTopOf="@id/btnOk" />
+            app:layout_constraintBottom_toBottomOf="@id/btnSave"
+            app:layout_constraintStart_toEndOf="@id/btnSave"
+            app:layout_constraintTop_toTopOf="@id/btnSave" />
 
         <ProgressBar
             android:id="@+id/pbWait"
@@ -79,6 +79,6 @@
             android:id="@+id/grpReady"
             android:layout_width="0dp"
             android:layout_height="0dp"
-            app:constraint_referenced_ids="cbSynchronize,tvAfter,etAfter,btnOk" />
+            app:constraint_referenced_ids="cbSynchronize,tvAfter,etAfter,btnSave" />
     </android.support.constraint.ConstraintLayout>
 </ScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_identity.xml b/app/src/main/res/layout/fragment_identity.xml
index 15cc57b7..cf00a2c2 100644
--- a/app/src/main/res/layout/fragment_identity.xml
+++ b/app/src/main/res/layout/fragment_identity.xml
@@ -229,11 +229,11 @@
             app:layout_constraintTop_toBottomOf="@id/cbSynchronize" />
 
         <Button
-            android:id="@+id/btnOk"
+            android:id="@+id/btnSave"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="12dp"
-            android:text="@android:string/ok"
+            android:text="@string/title_save"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/cbPrimary" />
 
@@ -244,14 +244,14 @@
             android:layout_height="24dp"
             android:layout_marginStart="12dp"
             android:indeterminate="true"
-            app:layout_constraintBottom_toBottomOf="@id/btnOk"
-            app:layout_constraintStart_toEndOf="@id/btnOk"
-            app:layout_constraintTop_toTopOf="@id/btnOk" />
+            app:layout_constraintBottom_toBottomOf="@id/btnSave"
+            app:layout_constraintStart_toEndOf="@id/btnSave"
+            app:layout_constraintTop_toTopOf="@id/btnSave" />
 
         <android.support.constraint.Group
             android:id="@+id/grpReady"
             android:layout_width="0dp"
             android:layout_height="0dp"
-            app:constraint_referenced_ids="etName,etEmail,spProvider,etHost,cbStartTls,etPort,etUser,tilPassword,cbPrimary,cbSynchronize,btnOk" />
+            app:constraint_referenced_ids="etName,etEmail,spProvider,etHost,cbStartTls,etPort,etUser,tilPassword,cbPrimary,cbSynchronize,btnSave" />
     </android.support.constraint.ConstraintLayout>
 </ScrollView>
\ No newline at end of file