diff --git a/app/src/main/java/eu/faircode/email/ActivityView.java b/app/src/main/java/eu/faircode/email/ActivityView.java
index 919ba4cc5d..fc655cca45 100644
--- a/app/src/main/java/eu/faircode/email/ActivityView.java
+++ b/app/src/main/java/eu/faircode/email/ActivityView.java
@@ -51,6 +51,7 @@ import androidx.annotation.Nullable;
 import androidx.appcompat.app.ActionBarDrawerToggle;
 import androidx.appcompat.app.AlertDialog;
 import androidx.core.app.NotificationCompat;
+import androidx.core.widget.NestedScrollView;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
 import androidx.fragment.app.FragmentTransaction;
@@ -93,7 +94,7 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB
     private TwoStateOwner owner = new TwoStateOwner("drawer");
     private DrawerLayoutEx drawerLayout;
     private ActionBarDrawerToggle drawerToggle;
-    private ScrollView drawerContainer;
+    private NestedScrollView drawerContainer;
     private ImageButton ibExpanderAccount;
     private RecyclerView rvAccount;
     private ImageButton ibExpanderUnified;
diff --git a/app/src/main/res/layout/activity_view_landscape.xml b/app/src/main/res/layout/activity_view_landscape.xml
index 45d902f5fb..2770cc67f7 100644
--- a/app/src/main/res/layout/activity_view_landscape.xml
+++ b/app/src/main/res/layout/activity_view_landscape.xml
@@ -31,7 +31,7 @@
             android:layout_weight="1" />
     </LinearLayout>
 
-    <eu.faircode.email.ScrollViewEx
+    <androidx.core.widget.NestedScrollView
         android:id="@+id/drawer_container"
         android:layout_width="270dp"
         android:layout_height="match_parent"
@@ -43,5 +43,5 @@
             layout="@layout/include_nav"
             android:layout_width="match_parent"
             android:layout_height="wrap_content" />
-    </eu.faircode.email.ScrollViewEx>
+    </androidx.core.widget.NestedScrollView>
 </eu.faircode.email.DrawerLayoutEx>
diff --git a/app/src/main/res/layout/activity_view_portrait.xml b/app/src/main/res/layout/activity_view_portrait.xml
index 703965ce74..f885f4913a 100644
--- a/app/src/main/res/layout/activity_view_portrait.xml
+++ b/app/src/main/res/layout/activity_view_portrait.xml
@@ -10,7 +10,7 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent" />
 
-    <eu.faircode.email.ScrollViewEx
+    <androidx.core.widget.NestedScrollView
         android:id="@+id/drawer_container"
         android:layout_width="270dp"
         android:layout_height="match_parent"
@@ -22,5 +22,5 @@
             layout="@layout/include_nav"
             android:layout_width="match_parent"
             android:layout_height="wrap_content" />
-    </eu.faircode.email.ScrollViewEx>
+    </androidx.core.widget.NestedScrollView>
 </eu.faircode.email.DrawerLayoutEx>