diff --git a/app/src/main/res/layout-land/assistant_welcome_fragment.xml b/app/src/main/res/layout-land/assistant_welcome_fragment.xml
index 2d8b9c539..25fd5a04e 100644
--- a/app/src/main/res/layout-land/assistant_welcome_fragment.xml
+++ b/app/src/main/res/layout-land/assistant_welcome_fragment.xml
@@ -33,7 +33,7 @@
             android:layout_alignParentTop="true"
             tools:layout="@layout/assistant_top_bar_fragment" />
 
-        <ScrollView
+        <androidx.core.widget.NestedScrollView
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:layout_below="@id/top_bar_fragment">
@@ -134,7 +134,7 @@
 
             </LinearLayout>
 
-        </ScrollView>
+        </androidx.core.widget.NestedScrollView>
 
     </RelativeLayout>
 
diff --git a/app/src/main/res/layout-land/history_detail_fragment.xml b/app/src/main/res/layout-land/history_detail_fragment.xml
index 983bd2b32..bb685a632 100644
--- a/app/src/main/res/layout-land/history_detail_fragment.xml
+++ b/app/src/main/res/layout-land/history_detail_fragment.xml
@@ -183,7 +183,7 @@
                     android:text="@string/history_calls_list"
                     android:textAllCaps="true" />
 
-                <ScrollView
+                <androidx.core.widget.NestedScrollView
                     android:layout_width="match_parent"
                     android:layout_height="match_parent">
 
@@ -194,7 +194,7 @@
                         app:entries="@{viewModel.callsHistory}"
                         app:layout="@{@layout/history_detail_cell}"/>
 
-                </ScrollView>
+                </androidx.core.widget.NestedScrollView>
 
             </LinearLayout>
 
diff --git a/app/src/main/res/layout-sw533dp-land/history_detail_fragment.xml b/app/src/main/res/layout-sw533dp-land/history_detail_fragment.xml
index 74d769d33..f4faa6e29 100644
--- a/app/src/main/res/layout-sw533dp-land/history_detail_fragment.xml
+++ b/app/src/main/res/layout-sw533dp-land/history_detail_fragment.xml
@@ -167,7 +167,7 @@
                 android:text="@string/history_calls_list"
                 android:textAllCaps="true" />
 
-            <ScrollView
+            <androidx.core.widget.NestedScrollView
                 android:layout_width="match_parent"
                 android:layout_height="match_parent">
 
@@ -178,7 +178,7 @@
                     app:entries="@{viewModel.callsHistory}"
                     app:layout="@{@layout/history_detail_cell}"/>
 
-            </ScrollView>
+            </androidx.core.widget.NestedScrollView>
 
         </LinearLayout>
 
diff --git a/app/src/main/res/layout-sw533dp-land/settings_fragment.xml b/app/src/main/res/layout-sw533dp-land/settings_fragment.xml
index 5e70aa604..cbda9530d 100644
--- a/app/src/main/res/layout-sw533dp-land/settings_fragment.xml
+++ b/app/src/main/res/layout-sw533dp-land/settings_fragment.xml
@@ -60,7 +60,7 @@
 
             </LinearLayout>
 
-            <ScrollView
+            <androidx.core.widget.NestedScrollView
                 android:layout_below="@id/top_bar"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent">
@@ -148,7 +148,7 @@
 
                 </LinearLayout>
 
-            </ScrollView>
+            </androidx.core.widget.NestedScrollView>
 
         </RelativeLayout>
 
diff --git a/app/src/main/res/layout-sw533dp/settings_fragment.xml b/app/src/main/res/layout-sw533dp/settings_fragment.xml
index 5e70aa604..cbda9530d 100644
--- a/app/src/main/res/layout-sw533dp/settings_fragment.xml
+++ b/app/src/main/res/layout-sw533dp/settings_fragment.xml
@@ -60,7 +60,7 @@
 
             </LinearLayout>
 
-            <ScrollView
+            <androidx.core.widget.NestedScrollView
                 android:layout_below="@id/top_bar"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent">
@@ -148,7 +148,7 @@
 
                 </LinearLayout>
 
-            </ScrollView>
+            </androidx.core.widget.NestedScrollView>
 
         </RelativeLayout>
 
diff --git a/app/src/main/res/layout/about_fragment.xml b/app/src/main/res/layout/about_fragment.xml
index a038e3ae7..b0a374be1 100644
--- a/app/src/main/res/layout/about_fragment.xml
+++ b/app/src/main/res/layout/about_fragment.xml
@@ -61,7 +61,7 @@
 
         </LinearLayout>
 
-        <ScrollView
+        <androidx.core.widget.NestedScrollView
             android:layout_below="@id/top_bar"
             android:layout_width="match_parent"
             android:layout_height="match_parent">
@@ -211,7 +211,7 @@
 
             </LinearLayout>
 
-        </ScrollView>
+        </androidx.core.widget.NestedScrollView>
 
         <include
             layout="@layout/wait_layout"
diff --git a/app/src/main/res/layout/assistant_account_login_fragment.xml b/app/src/main/res/layout/assistant_account_login_fragment.xml
index 29e2c37d1..f5ee6d8c2 100644
--- a/app/src/main/res/layout/assistant_account_login_fragment.xml
+++ b/app/src/main/res/layout/assistant_account_login_fragment.xml
@@ -32,7 +32,7 @@
             android:layout_alignParentTop="true"
             tools:layout="@layout/assistant_top_bar_fragment" />
 
-        <ScrollView
+        <androidx.core.widget.NestedScrollView
             android:layout_below="@id/top_bar_fragment"
             android:layout_width="match_parent"
             android:layout_height="match_parent">
@@ -251,7 +251,7 @@
 
             </LinearLayout>
 
-        </ScrollView>
+        </androidx.core.widget.NestedScrollView>
 
         <include
             layout="@layout/wait_layout"
diff --git a/app/src/main/res/layout/assistant_email_account_creation_fragment.xml b/app/src/main/res/layout/assistant_email_account_creation_fragment.xml
index ce93f0710..78906ee61 100644
--- a/app/src/main/res/layout/assistant_email_account_creation_fragment.xml
+++ b/app/src/main/res/layout/assistant_email_account_creation_fragment.xml
@@ -23,7 +23,7 @@
             android:layout_alignParentTop="true"
             tools:layout="@layout/assistant_top_bar_fragment" />
 
-        <ScrollView
+        <androidx.core.widget.NestedScrollView
             android:layout_below="@id/top_bar_fragment"
             android:layout_width="match_parent"
             android:layout_height="match_parent">
@@ -142,7 +142,7 @@
 
             </LinearLayout>
 
-        </ScrollView>
+        </androidx.core.widget.NestedScrollView>
 
         <include
             layout="@layout/wait_layout"
diff --git a/app/src/main/res/layout/assistant_generic_account_login_fragment.xml b/app/src/main/res/layout/assistant_generic_account_login_fragment.xml
index 0d910bba9..a1790bf5c 100644
--- a/app/src/main/res/layout/assistant_generic_account_login_fragment.xml
+++ b/app/src/main/res/layout/assistant_generic_account_login_fragment.xml
@@ -24,7 +24,7 @@
             android:layout_alignParentTop="true"
             tools:layout="@layout/assistant_top_bar_fragment" />
 
-        <ScrollView
+        <androidx.core.widget.NestedScrollView
             android:layout_below="@id/top_bar_fragment"
             android:layout_width="match_parent"
             android:layout_height="match_parent">
@@ -178,7 +178,7 @@
 
             </LinearLayout>
 
-        </ScrollView>
+        </androidx.core.widget.NestedScrollView>
 
         <include
             layout="@layout/wait_layout"
diff --git a/app/src/main/res/layout/assistant_phone_account_creation_fragment.xml b/app/src/main/res/layout/assistant_phone_account_creation_fragment.xml
index e558e320b..8ae77dcbc 100644
--- a/app/src/main/res/layout/assistant_phone_account_creation_fragment.xml
+++ b/app/src/main/res/layout/assistant_phone_account_creation_fragment.xml
@@ -28,7 +28,7 @@
             android:layout_alignParentTop="true"
             tools:layout="@layout/assistant_top_bar_fragment" />
 
-        <ScrollView
+        <androidx.core.widget.NestedScrollView
             android:layout_below="@id/top_bar_fragment"
             android:layout_width="match_parent"
             android:layout_height="match_parent">
@@ -203,7 +203,7 @@
 
             </LinearLayout>
 
-        </ScrollView>
+        </androidx.core.widget.NestedScrollView>
 
         <include
             layout="@layout/wait_layout"
diff --git a/app/src/main/res/layout/assistant_phone_account_linking_fragment.xml b/app/src/main/res/layout/assistant_phone_account_linking_fragment.xml
index 4aa028a18..5bc5d3a63 100644
--- a/app/src/main/res/layout/assistant_phone_account_linking_fragment.xml
+++ b/app/src/main/res/layout/assistant_phone_account_linking_fragment.xml
@@ -28,7 +28,7 @@
             android:layout_alignParentTop="true"
             tools:layout="@layout/assistant_top_bar_fragment" />
 
-        <ScrollView
+        <androidx.core.widget.NestedScrollView
             android:layout_below="@id/top_bar_fragment"
             android:layout_width="match_parent"
             android:layout_height="match_parent">
@@ -180,7 +180,7 @@
 
             </LinearLayout>
 
-        </ScrollView>
+        </androidx.core.widget.NestedScrollView>
 
         <include
             layout="@layout/wait_layout"
diff --git a/app/src/main/res/layout/assistant_welcome_fragment.xml b/app/src/main/res/layout/assistant_welcome_fragment.xml
index d82ed2b08..db96475fe 100644
--- a/app/src/main/res/layout/assistant_welcome_fragment.xml
+++ b/app/src/main/res/layout/assistant_welcome_fragment.xml
@@ -33,7 +33,7 @@
             android:layout_alignParentTop="true"
             tools:layout="@layout/assistant_top_bar_fragment" />
 
-        <ScrollView
+        <androidx.core.widget.NestedScrollView
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:layout_below="@id/top_bar_fragment">
@@ -134,7 +134,7 @@
 
             </LinearLayout>
 
-        </ScrollView>
+        </androidx.core.widget.NestedScrollView>
 
     </RelativeLayout>
 
diff --git a/app/src/main/res/layout/call_statistics_fragment.xml b/app/src/main/res/layout/call_statistics_fragment.xml
index ef39ee4bd..c24873765 100644
--- a/app/src/main/res/layout/call_statistics_fragment.xml
+++ b/app/src/main/res/layout/call_statistics_fragment.xml
@@ -9,7 +9,7 @@
             type="org.linphone.activities.call.viewmodels.StatisticsListViewModel" />
     </data>
 
-    <ScrollView
+    <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:background="?attr/backgroundColor"
@@ -23,6 +23,6 @@
             app:entries="@{viewModel.callStatsList}"
             app:layout="@{@layout/call_statistics_cell}" />
 
-    </ScrollView>
+    </androidx.core.widget.NestedScrollView>
 
 </layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/chat_room_devices_fragment.xml b/app/src/main/res/layout/chat_room_devices_fragment.xml
index 43b0e13c6..16b88fd4e 100644
--- a/app/src/main/res/layout/chat_room_devices_fragment.xml
+++ b/app/src/main/res/layout/chat_room_devices_fragment.xml
@@ -52,7 +52,7 @@
 
         </LinearLayout>
 
-        <ScrollView
+        <androidx.core.widget.NestedScrollView
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:layout_below="@id/top_bar">
@@ -64,7 +64,7 @@
                 app:entries="@{viewModel.participants}"
                 app:layout="@{@layout/chat_room_devices_group_cell}" />
 
-        </ScrollView>
+        </androidx.core.widget.NestedScrollView>
 
     </RelativeLayout>
 
diff --git a/app/src/main/res/layout/chat_room_ephemeral_fragment.xml b/app/src/main/res/layout/chat_room_ephemeral_fragment.xml
index 8977d7fed..fa8cc82a3 100644
--- a/app/src/main/res/layout/chat_room_ephemeral_fragment.xml
+++ b/app/src/main/res/layout/chat_room_ephemeral_fragment.xml
@@ -60,7 +60,7 @@
 
         </LinearLayout>
 
-        <ScrollView
+        <androidx.core.widget.NestedScrollView
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:layout_below="@id/top_bar">
@@ -105,7 +105,7 @@
 
             </LinearLayout>
 
-        </ScrollView>
+        </androidx.core.widget.NestedScrollView>
 
     </RelativeLayout>
 
diff --git a/app/src/main/res/layout/contact_detail_fragment.xml b/app/src/main/res/layout/contact_detail_fragment.xml
index bfe079adf..e306904b9 100644
--- a/app/src/main/res/layout/contact_detail_fragment.xml
+++ b/app/src/main/res/layout/contact_detail_fragment.xml
@@ -68,7 +68,7 @@
 
         </LinearLayout>
 
-        <ScrollView
+        <androidx.core.widget.NestedScrollView
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:layout_below="@id/top_bar">
@@ -115,7 +115,7 @@
 
             </LinearLayout>
 
-        </ScrollView>
+        </androidx.core.widget.NestedScrollView>
 
         <include
             layout="@layout/wait_layout"
diff --git a/app/src/main/res/layout/contact_editor_fragment.xml b/app/src/main/res/layout/contact_editor_fragment.xml
index 42653b1cf..01530a7ca 100644
--- a/app/src/main/res/layout/contact_editor_fragment.xml
+++ b/app/src/main/res/layout/contact_editor_fragment.xml
@@ -60,7 +60,7 @@
 
         </LinearLayout>
 
-        <ScrollView
+        <androidx.core.widget.NestedScrollView
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:layout_below="@id/top_bar">
@@ -213,7 +213,7 @@
 
             </LinearLayout>
 
-        </ScrollView>
+        </androidx.core.widget.NestedScrollView>
 
     </RelativeLayout>
 
diff --git a/app/src/main/res/layout/history_detail_fragment.xml b/app/src/main/res/layout/history_detail_fragment.xml
index 74d769d33..f4faa6e29 100644
--- a/app/src/main/res/layout/history_detail_fragment.xml
+++ b/app/src/main/res/layout/history_detail_fragment.xml
@@ -167,7 +167,7 @@
                 android:text="@string/history_calls_list"
                 android:textAllCaps="true" />
 
-            <ScrollView
+            <androidx.core.widget.NestedScrollView
                 android:layout_width="match_parent"
                 android:layout_height="match_parent">
 
@@ -178,7 +178,7 @@
                     app:entries="@{viewModel.callsHistory}"
                     app:layout="@{@layout/history_detail_cell}"/>
 
-            </ScrollView>
+            </androidx.core.widget.NestedScrollView>
 
         </LinearLayout>
 
diff --git a/app/src/main/res/layout/settings_account_fragment.xml b/app/src/main/res/layout/settings_account_fragment.xml
index a16842dc1..384254f6b 100644
--- a/app/src/main/res/layout/settings_account_fragment.xml
+++ b/app/src/main/res/layout/settings_account_fragment.xml
@@ -56,7 +56,7 @@
 
         </LinearLayout>
 
-        <ScrollView
+        <androidx.core.widget.NestedScrollView
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:layout_below="@id/top_bar">
@@ -239,7 +239,7 @@
 
             </LinearLayout>
 
-        </ScrollView>
+        </androidx.core.widget.NestedScrollView>
 
         <include
             layout="@layout/wait_layout"
diff --git a/app/src/main/res/layout/settings_advanced_fragment.xml b/app/src/main/res/layout/settings_advanced_fragment.xml
index 11d709b96..34faaecab 100644
--- a/app/src/main/res/layout/settings_advanced_fragment.xml
+++ b/app/src/main/res/layout/settings_advanced_fragment.xml
@@ -55,7 +55,7 @@
 
         </LinearLayout>
 
-        <ScrollView
+        <androidx.core.widget.NestedScrollView
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:layout_below="@id/top_bar">
@@ -156,7 +156,7 @@
 
             </LinearLayout>
 
-        </ScrollView>
+        </androidx.core.widget.NestedScrollView>
 
     </RelativeLayout>
 
diff --git a/app/src/main/res/layout/settings_audio_fragment.xml b/app/src/main/res/layout/settings_audio_fragment.xml
index 3bf3d7e50..d9b0d4acf 100644
--- a/app/src/main/res/layout/settings_audio_fragment.xml
+++ b/app/src/main/res/layout/settings_audio_fragment.xml
@@ -55,7 +55,7 @@
 
         </LinearLayout>
 
-        <ScrollView
+        <androidx.core.widget.NestedScrollView
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:layout_below="@id/top_bar">
@@ -149,7 +149,7 @@
 
             </LinearLayout>
 
-        </ScrollView>
+        </androidx.core.widget.NestedScrollView>
 
     </RelativeLayout>
 
diff --git a/app/src/main/res/layout/settings_call_fragment.xml b/app/src/main/res/layout/settings_call_fragment.xml
index c3dbfb6c5..7891290f1 100644
--- a/app/src/main/res/layout/settings_call_fragment.xml
+++ b/app/src/main/res/layout/settings_call_fragment.xml
@@ -55,7 +55,7 @@
 
         </LinearLayout>
 
-        <ScrollView
+        <androidx.core.widget.NestedScrollView
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:layout_below="@id/top_bar">
@@ -171,7 +171,7 @@
 
             </LinearLayout>
 
-        </ScrollView>
+        </androidx.core.widget.NestedScrollView>
 
     </RelativeLayout>
 
diff --git a/app/src/main/res/layout/settings_chat_fragment.xml b/app/src/main/res/layout/settings_chat_fragment.xml
index 127e482ca..82b9750d3 100644
--- a/app/src/main/res/layout/settings_chat_fragment.xml
+++ b/app/src/main/res/layout/settings_chat_fragment.xml
@@ -55,7 +55,7 @@
 
         </LinearLayout>
 
-        <ScrollView
+        <androidx.core.widget.NestedScrollView
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:layout_below="@id/top_bar">
@@ -134,7 +134,7 @@
 
             </LinearLayout>
 
-        </ScrollView>
+        </androidx.core.widget.NestedScrollView>
 
     </RelativeLayout>
 
diff --git a/app/src/main/res/layout/settings_contacts_fragment.xml b/app/src/main/res/layout/settings_contacts_fragment.xml
index aebaf543d..79313e1f5 100644
--- a/app/src/main/res/layout/settings_contacts_fragment.xml
+++ b/app/src/main/res/layout/settings_contacts_fragment.xml
@@ -54,7 +54,7 @@
 
         </LinearLayout>
 
-        <ScrollView
+        <androidx.core.widget.NestedScrollView
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:layout_below="@id/top_bar">
@@ -106,7 +106,7 @@
 
             </LinearLayout>
 
-        </ScrollView>
+        </androidx.core.widget.NestedScrollView>
 
     </RelativeLayout>
 
diff --git a/app/src/main/res/layout/settings_fragment.xml b/app/src/main/res/layout/settings_fragment.xml
index b3152eb1a..cb963ff2d 100644
--- a/app/src/main/res/layout/settings_fragment.xml
+++ b/app/src/main/res/layout/settings_fragment.xml
@@ -54,7 +54,7 @@
 
         </LinearLayout>
 
-        <ScrollView
+        <androidx.core.widget.NestedScrollView
             android:layout_below="@id/top_bar"
             android:layout_width="match_parent"
             android:layout_height="match_parent">
@@ -142,7 +142,7 @@
 
             </LinearLayout>
 
-        </ScrollView>
+        </androidx.core.widget.NestedScrollView>
 
     </RelativeLayout>
 
diff --git a/app/src/main/res/layout/settings_network_fragment.xml b/app/src/main/res/layout/settings_network_fragment.xml
index eb36f1cac..b7d0f6ca3 100644
--- a/app/src/main/res/layout/settings_network_fragment.xml
+++ b/app/src/main/res/layout/settings_network_fragment.xml
@@ -55,7 +55,7 @@
 
         </LinearLayout>
 
-        <ScrollView
+        <androidx.core.widget.NestedScrollView
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:layout_below="@id/top_bar">
@@ -114,7 +114,7 @@
 
             </LinearLayout>
 
-        </ScrollView>
+        </androidx.core.widget.NestedScrollView>
 
     </RelativeLayout>
 
diff --git a/app/src/main/res/layout/settings_tunnel_fragment.xml b/app/src/main/res/layout/settings_tunnel_fragment.xml
index aec5b5525..76d78db72 100644
--- a/app/src/main/res/layout/settings_tunnel_fragment.xml
+++ b/app/src/main/res/layout/settings_tunnel_fragment.xml
@@ -55,7 +55,7 @@
 
         </LinearLayout>
 
-        <ScrollView
+        <androidx.core.widget.NestedScrollView
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:layout_below="@id/top_bar">
@@ -118,7 +118,7 @@
 
             </LinearLayout>
 
-        </ScrollView>
+        </androidx.core.widget.NestedScrollView>
 
     </RelativeLayout>
 
diff --git a/app/src/main/res/layout/settings_video_fragment.xml b/app/src/main/res/layout/settings_video_fragment.xml
index ef26b760f..747cd55e1 100644
--- a/app/src/main/res/layout/settings_video_fragment.xml
+++ b/app/src/main/res/layout/settings_video_fragment.xml
@@ -55,7 +55,7 @@
 
         </LinearLayout>
 
-        <ScrollView
+        <androidx.core.widget.NestedScrollView
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:layout_below="@id/top_bar">
@@ -162,7 +162,7 @@
 
             </LinearLayout>
 
-        </ScrollView>
+        </androidx.core.widget.NestedScrollView>
 
     </RelativeLayout>