diff --git a/src/java/JavaFileStorageTest-AS/app/src/main/res/layout/sftp_credentials.xml b/src/java/JavaFileStorageTest-AS/app/src/main/res/layout/sftp_credentials.xml
index 543f038e..4705677a 100644
--- a/src/java/JavaFileStorageTest-AS/app/src/main/res/layout/sftp_credentials.xml
+++ b/src/java/JavaFileStorageTest-AS/app/src/main/res/layout/sftp_credentials.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+            android:layout_width="fill_parent"
+            android:layout_height="fill_parent">
+<LinearLayout
     android:orientation="vertical"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
@@ -216,4 +219,5 @@
             android:layout_marginLeft="5dp"
             android:text="Resolve" />
     </LinearLayout>
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
+</ScrollView>
\ No newline at end of file
diff --git a/src/java/JavaFileStorageTest-AS/app/src/main/res/layout/webdav_credentials.xml b/src/java/JavaFileStorageTest-AS/app/src/main/res/layout/webdav_credentials.xml
index ea6b52d3..f2231344 100644
--- a/src/java/JavaFileStorageTest-AS/app/src/main/res/layout/webdav_credentials.xml
+++ b/src/java/JavaFileStorageTest-AS/app/src/main/res/layout/webdav_credentials.xml
@@ -1,4 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+            android:layout_width="fill_parent"
+            android:layout_height="fill_parent">
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:orientation="vertical"
     android:layout_width="fill_parent"
@@ -36,4 +39,5 @@
         android:hint="@string/hint_pass"
         android:importantForAccessibility="no" />
 
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
+</ScrollView>
\ No newline at end of file
diff --git a/src/keepass2android-app/Resources/layout/ftpcredentials.xml b/src/keepass2android-app/Resources/layout/ftpcredentials.xml
index 7a01e925..5fe09ba7 100644
--- a/src/keepass2android-app/Resources/layout/ftpcredentials.xml
+++ b/src/keepass2android-app/Resources/layout/ftpcredentials.xml
@@ -1,4 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+            android:layout_width="fill_parent"
+            android:layout_height="fill_parent">
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:orientation="vertical"
     android:layout_width="fill_parent"
@@ -75,4 +78,5 @@
 			 />
 
 
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
+</ScrollView>
\ No newline at end of file
diff --git a/src/keepass2android-app/Resources/layout/httpcredentials.axml b/src/keepass2android-app/Resources/layout/httpcredentials.axml
index f315a548..29c4a9b7 100644
--- a/src/keepass2android-app/Resources/layout/httpcredentials.axml
+++ b/src/keepass2android-app/Resources/layout/httpcredentials.axml
@@ -1,4 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+            android:layout_width="fill_parent"
+            android:layout_height="fill_parent">
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:orientation="vertical"
     android:layout_width="fill_parent"
@@ -41,4 +44,5 @@
 
 
 
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
+</ScrollView>
\ No newline at end of file
diff --git a/src/keepass2android-app/Resources/layout/megacredentials.xml b/src/keepass2android-app/Resources/layout/megacredentials.xml
index da669351..5e31a14e 100644
--- a/src/keepass2android-app/Resources/layout/megacredentials.xml
+++ b/src/keepass2android-app/Resources/layout/megacredentials.xml
@@ -1,4 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+            android:layout_width="fill_parent"
+            android:layout_height="fill_parent">
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:orientation="vertical"
     android:layout_width="fill_parent"
@@ -27,4 +30,5 @@
             android:importantForAccessibility="no"/>
 
 
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
+</ScrollView>
\ No newline at end of file
diff --git a/src/keepass2android-app/Resources/layout/owncloudcredentials.xml b/src/keepass2android-app/Resources/layout/owncloudcredentials.xml
index cb4bf59a..9d51a79a 100644
--- a/src/keepass2android-app/Resources/layout/owncloudcredentials.xml
+++ b/src/keepass2android-app/Resources/layout/owncloudcredentials.xml
@@ -1,4 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+            android:layout_width="fill_parent"
+            android:layout_height="fill_parent">
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:orientation="vertical"
     android:layout_width="fill_parent"
@@ -42,4 +45,5 @@
 
 
 
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
+</ScrollView>
\ No newline at end of file
diff --git a/src/keepass2android-app/Resources/layout/sftpcredentials.xml b/src/keepass2android-app/Resources/layout/sftpcredentials.xml
index b0e7c6eb..d35edbfe 100644
--- a/src/keepass2android-app/Resources/layout/sftpcredentials.xml
+++ b/src/keepass2android-app/Resources/layout/sftpcredentials.xml
@@ -1,4 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+            android:layout_width="fill_parent"
+            android:layout_height="fill_parent">
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:orientation="vertical"
     android:layout_width="fill_parent"
@@ -197,3 +200,5 @@
 			 />
 
 </LinearLayout>
+
+</ScrollView>
\ No newline at end of file
diff --git a/src/keepass2android-app/Resources/layout/smbcredentials.axml b/src/keepass2android-app/Resources/layout/smbcredentials.axml
index cbde2d3c..9b2b0c5d 100644
--- a/src/keepass2android-app/Resources/layout/smbcredentials.axml
+++ b/src/keepass2android-app/Resources/layout/smbcredentials.axml
@@ -1,4 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+            android:layout_width="fill_parent"
+            android:layout_height="fill_parent">
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:orientation="vertical"
     android:layout_width="fill_parent"
@@ -52,4 +55,5 @@
 
 
 
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
+</ScrollView>
\ No newline at end of file
diff --git a/src/keepass2android-app/Resources/layout/url_credentials.xml b/src/keepass2android-app/Resources/layout/url_credentials.xml
index ab1a7880..16388505 100644
--- a/src/keepass2android-app/Resources/layout/url_credentials.xml
+++ b/src/keepass2android-app/Resources/layout/url_credentials.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="wrap_content">
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+            android:layout_width="fill_parent"
+            android:layout_height="fill_parent">
+  <RelativeLayout
+      android:layout_width="fill_parent"
+      android:layout_height="wrap_content">
     <EditText
         android:id="@+id/cred_username"
         android:layout_width="fill_parent"
@@ -22,4 +25,5 @@
         android:layout_below="@id/cred_password"
         android:entries="@array/cred_remember_modes"
         android:id="@+id/cred_remember_mode" />
-</RelativeLayout>
\ No newline at end of file
+  </RelativeLayout>
+</ScrollView>
\ No newline at end of file