diff --git a/app/src/main/java/eu/faircode/email/FragmentAccount.java b/app/src/main/java/eu/faircode/email/FragmentAccount.java
index 38c7ac9dc8..e38127a25f 100644
--- a/app/src/main/java/eu/faircode/email/FragmentAccount.java
+++ b/app/src/main/java/eu/faircode/email/FragmentAccount.java
@@ -287,12 +287,6 @@ public class FragmentAccount extends FragmentEx {
                         if (TextUtils.isEmpty(password))
                             throw new Throwable(getContext().getString(R.string.title_no_password));
 
-                        // Refresh token
-                        if (id >= 0 && auth_type == Helper.AUTH_TYPE_GMAIL) {
-                            password = Helper.refreshToken(getContext(), "com.google", user, password);
-                            args.putString("password", password);
-                        }
-
                         // Check IMAP server / get folders
                         List<EntityFolder> folders = new ArrayList<>();
                         Properties props = MessageHelper.getSessionProperties(context, auth_type);
@@ -371,9 +365,6 @@ public class FragmentAccount extends FragmentEx {
                         btnCheck.setEnabled(true);
                         pbCheck.setVisibility(View.GONE);
 
-                        // Refreshed token
-                        tilPassword.getEditText().setText(args.getString("password"));
-
                         final Collator collator = Collator.getInstance(Locale.getDefault());
                         collator.setStrength(Collator.SECONDARY); // Case insensitive, process accents etc
 
diff --git a/app/src/main/java/eu/faircode/email/FragmentIdentity.java b/app/src/main/java/eu/faircode/email/FragmentIdentity.java
index 955f81b886..7f695f3983 100644
--- a/app/src/main/java/eu/faircode/email/FragmentIdentity.java
+++ b/app/src/main/java/eu/faircode/email/FragmentIdentity.java
@@ -267,10 +267,6 @@ public class FragmentIdentity extends FragmentEx {
                         if (TextUtils.isEmpty(replyto))
                             replyto = null;
 
-                        // Refresh token
-                        if (id >= 0 && auth_type == Helper.AUTH_TYPE_GMAIL)
-                            password = Helper.refreshToken(getContext(), "com.google", user, password);
-
                         // Check SMTP server
                         if (synchronize) {
                             Properties props = MessageHelper.getSessionProperties(context, auth_type);