diff --git a/OpenPGP-Keychain/res/layout/select_secret_key_layout_fragment.xml b/OpenPGP-Keychain/res/layout/select_secret_key_layout_fragment.xml
index 11429ea05..4a3cd3d28 100644
--- a/OpenPGP-Keychain/res/layout/select_secret_key_layout_fragment.xml
+++ b/OpenPGP-Keychain/res/layout/select_secret_key_layout_fragment.xml
@@ -10,7 +10,9 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
-        android:layout_margin="4dp"
+        android:layout_marginBottom="4dp"
+        android:layout_marginRight="4dp"
+        android:layout_marginTop="4dp"
         android:text="@string/api_settings_select_key"
         bootstrapbutton:bb_icon_left="fa-key"
         bootstrapbutton:bb_size="default"
@@ -19,6 +21,9 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:layout_marginBottom="4dp"
+        android:layout_marginLeft="4dp"
+        android:layout_marginTop="4dp"
         android:orientation="vertical"
         android:paddingLeft="16dp" >
 
diff --git a/OpenPGP-Keychain/res/layout/sign_key_activity.xml b/OpenPGP-Keychain/res/layout/sign_key_activity.xml
index 1bb2e6bab..98c602e88 100644
--- a/OpenPGP-Keychain/res/layout/sign_key_activity.xml
+++ b/OpenPGP-Keychain/res/layout/sign_key_activity.xml
@@ -1,61 +1,68 @@
 <?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"
     xmlns:bootstrapbutton="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical"
-    android:padding="16dp" >
+    android:layout_height="match_parent" >
 
-    <TextView
-        style="@style/SectionHeader"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="4dp"
-        android:text="@string/section_signing_key" />
-
-    <fragment
-        android:id="@+id/sign_key_select_key_fragment"
-        android:name="org.sufficientlysecure.keychain.ui.SelectSecretKeyLayoutFragment"
+    <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginBottom="4dp"
-        android:layout_marginTop="4dp"
-        tools:layout="@layout/select_secret_key_layout_fragment" />
+        android:layout_marginLeft="16dp"
+        android:layout_marginRight="16dp"
+        android:orientation="vertical" >
 
-    <TextView
-        style="@style/SectionHeader"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="4dp"
-        android:layout_marginTop="14dp"
-        android:text="@string/section_upload_key" />
+        <TextView
+            style="@style/SectionHeader"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="4dp"
+            android:layout_marginTop="14dp"
+            android:text="@string/section_signing_key" />
 
-    <CheckBox
-        android:id="@+id/sign_key_upload_checkbox"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="4dp"
-        android:layout_marginTop="4dp"
-        android:checked="false"
-        android:text="@string/label_send_key" />
+        <fragment
+            android:id="@+id/sign_key_select_key_fragment"
+            android:name="org.sufficientlysecure.keychain.ui.SelectSecretKeyLayoutFragment"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="4dp"
+            android:layout_marginTop="4dp"
+            tools:layout="@layout/select_secret_key_layout_fragment" />
 
-    <Spinner
-        android:id="@+id/sign_key_keyserver"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="4dp"
-        android:layout_marginTop="4dp"
-        android:enabled="false" />
+        <TextView
+            style="@style/SectionHeader"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="4dp"
+            android:layout_marginTop="14dp"
+            android:text="@string/section_upload_key" />
 
-    <com.beardedhen.androidbootstrap.BootstrapButton
-        android:id="@+id/sign_key_sign_button"
-        android:layout_width="match_parent"
-        android:layout_height="60dp"
-        android:layout_marginBottom="4dp"
-        android:layout_marginTop="14dp"
-        android:text="@string/btn_sign"
-        bootstrapbutton:bb_icon_left="fa-pencil"
-        bootstrapbutton:bb_type="info" />
+        <CheckBox
+            android:id="@+id/sign_key_upload_checkbox"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="4dp"
+            android:layout_marginTop="4dp"
+            android:checked="false"
+            android:text="@string/label_send_key" />
 
-</LinearLayout>
\ No newline at end of file
+        <Spinner
+            android:id="@+id/sign_key_keyserver"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="4dp"
+            android:layout_marginTop="4dp"
+            android:enabled="false" />
+
+        <com.beardedhen.androidbootstrap.BootstrapButton
+            android:id="@+id/sign_key_sign_button"
+            android:layout_width="match_parent"
+            android:layout_height="60dp"
+            android:layout_marginBottom="4dp"
+            android:layout_marginTop="14dp"
+            android:text="@string/btn_sign"
+            bootstrapbutton:bb_icon_left="fa-pencil"
+            bootstrapbutton:bb_type="info" />
+    </LinearLayout>
+
+</ScrollView>
\ No newline at end of file
diff --git a/OpenPGP-Keychain/res/layout/view_key_activity.xml b/OpenPGP-Keychain/res/layout/view_key_activity.xml
index babec70f6..bf49fdfad 100644
--- a/OpenPGP-Keychain/res/layout/view_key_activity.xml
+++ b/OpenPGP-Keychain/res/layout/view_key_activity.xml
@@ -6,7 +6,6 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginRight="?android:attr/scrollbarSize"
         android:orientation="vertical"
         android:paddingLeft="16dp"
         android:paddingRight="16dp" >