diff --git a/app/src/main/java/eu/faircode/email/FragmentAccount.java b/app/src/main/java/eu/faircode/email/FragmentAccount.java
index a2fc62feb6..71fd2421c7 100644
--- a/app/src/main/java/eu/faircode/email/FragmentAccount.java
+++ b/app/src/main/java/eu/faircode/email/FragmentAccount.java
@@ -89,6 +89,7 @@ import static android.accounts.AccountManager.newChooseAccountIntent;
 
 public class FragmentAccount extends FragmentBase {
     private ViewGroup view;
+    private ScrollView scroll;
 
     private Spinner spProvider;
 
@@ -164,6 +165,7 @@ public class FragmentAccount extends FragmentBase {
         setHasOptionsMenu(true);
 
         view = (ViewGroup) inflater.inflate(R.layout.fragment_account, container, false);
+        scroll = view.findViewById(R.id.scroll);
 
         // Get controls
         spProvider = view.findViewById(R.id.spProvider);
@@ -377,7 +379,7 @@ public class FragmentAccount extends FragmentBase {
                     new Handler().post(new Runnable() {
                         @Override
                         public void run() {
-                            ((ScrollView) view).smoothScrollTo(0, btnAdvanced.getTop());
+                            scroll.smoothScrollTo(0, btnAdvanced.getTop());
                         }
                     });
             }
@@ -691,7 +693,7 @@ public class FragmentAccount extends FragmentBase {
                 new Handler().post(new Runnable() {
                     @Override
                     public void run() {
-                        ((ScrollView) view).smoothScrollTo(0, btnSave.getBottom());
+                        scroll.smoothScrollTo(0, btnSave.getBottom());
                     }
                 });
             }
@@ -709,7 +711,7 @@ public class FragmentAccount extends FragmentBase {
                     new Handler().post(new Runnable() {
                         @Override
                         public void run() {
-                            ((ScrollView) view).smoothScrollTo(0, tvError.getBottom());
+                            scroll.smoothScrollTo(0, tvError.getBottom());
                         }
                     });
                 }
@@ -1067,7 +1069,7 @@ public class FragmentAccount extends FragmentBase {
                     new Handler().post(new Runnable() {
                         @Override
                         public void run() {
-                            ((ScrollView) view).smoothScrollTo(0, tvError.getBottom());
+                            scroll.smoothScrollTo(0, tvError.getBottom());
                         }
                     });
                 }
diff --git a/app/src/main/java/eu/faircode/email/FragmentIdentity.java b/app/src/main/java/eu/faircode/email/FragmentIdentity.java
index 897f2859fa..56a27b3e64 100644
--- a/app/src/main/java/eu/faircode/email/FragmentIdentity.java
+++ b/app/src/main/java/eu/faircode/email/FragmentIdentity.java
@@ -72,6 +72,7 @@ import javax.mail.Transport;
 
 public class FragmentIdentity extends FragmentBase {
     private ViewGroup view;
+    private ScrollView scroll;
 
     private EditText etName;
     private EditText etEmail;
@@ -142,6 +143,7 @@ public class FragmentIdentity extends FragmentBase {
         setHasOptionsMenu(true);
 
         view = (ViewGroup) inflater.inflate(R.layout.fragment_identity, container, false);
+        scroll = view.findViewById(R.id.scroll);
 
         // Get controls
         etName = view.findViewById(R.id.etName);
@@ -350,7 +352,7 @@ public class FragmentIdentity extends FragmentBase {
                     new Handler().post(new Runnable() {
                         @Override
                         public void run() {
-                            ((ScrollView) view).smoothScrollTo(0, btnAdvanced.getTop());
+                            scroll.smoothScrollTo(0, btnAdvanced.getTop());
                         }
                     });
             }
@@ -735,7 +737,7 @@ public class FragmentIdentity extends FragmentBase {
                     new Handler().post(new Runnable() {
                         @Override
                         public void run() {
-                            ((ScrollView) view).smoothScrollTo(0, tvError.getBottom());
+                            scroll.smoothScrollTo(0, tvError.getBottom());
                         }
                     });
                 }
diff --git a/app/src/main/res/layout/fragment_account.xml b/app/src/main/res/layout/fragment_account.xml
index a22902b82a..e79307208b 100644
--- a/app/src/main/res/layout/fragment_account.xml
+++ b/app/src/main/res/layout/fragment_account.xml
@@ -8,6 +8,7 @@
     tools:context=".ActivitySetup">
 
     <ScrollView
+        android:id="@+id/scroll"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:orientation="vertical"
diff --git a/app/src/main/res/layout/fragment_identity.xml b/app/src/main/res/layout/fragment_identity.xml
index 7bedc83298..804db3523a 100644
--- a/app/src/main/res/layout/fragment_identity.xml
+++ b/app/src/main/res/layout/fragment_identity.xml
@@ -7,6 +7,7 @@
     tools:context=".ActivitySetup">
 
     <ScrollView
+        android:id="@+id/scroll"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:orientation="vertical"