diff --git a/res/layout/activity_account_details.xml b/res/layout/activity_account_details.xml
index 8ac7959659..a47391c5fd 100644
--- a/res/layout/activity_account_details.xml
+++ b/res/layout/activity_account_details.xml
@@ -45,6 +45,7 @@
             android:layout_width="match_parent"
             android:layout_height="50dp"
             android:layout_marginTop="20dp"
+            android:layout_marginBottom="40dp"
             android:layout_gravity="center_horizontal"
             android:background="@color/signal_primary"
             android:textColor="@color/white"
diff --git a/res/layout/activity_key_pair.xml b/res/layout/activity_key_pair.xml
index c30a643ee2..3091e54e5a 100644
--- a/res/layout/activity_key_pair.xml
+++ b/res/layout/activity_key_pair.xml
@@ -91,6 +91,7 @@
             android:layout_width="match_parent"
             android:layout_height="50dp"
             android:layout_marginTop="20dp"
+            android:layout_marginBottom="40dp"
             android:layout_gravity="center_horizontal"
             android:background="@color/signal_primary"
             android:textColor="@color/white"
diff --git a/res/layout/activity_new_conversation.xml b/res/layout/activity_new_conversation.xml
index e929910b48..8fbea6bae7 100644
--- a/res/layout/activity_new_conversation.xml
+++ b/res/layout/activity_new_conversation.xml
@@ -1,40 +1,48 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
+<ScrollView
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:layout_marginStart="32dp"
-    android:layout_marginEnd="32dp"
-    android:orientation="vertical">
+    android:fillViewport="true">
 
-    <org.thoughtcrime.securesms.components.LabeledEditText
-        android:id="@+id/publicKeyEditText"
+    <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="32dp"
-        app:labeledEditText_label="@string/activity_new_conversation_public_key_edit_text_label"/>
+        android:layout_height="match_parent"
+        android:layout_marginStart="32dp"
+        android:layout_marginEnd="32dp"
+        android:orientation="vertical">
 
-    <TextView
-        android:id="@+id/explanationTextView"
-        style="@style/Signal.Text.Body"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="24dp"
-        android:text="@string/activity_new_conversation_public_key_explanation" />
+        <org.thoughtcrime.securesms.components.LabeledEditText
+            android:id="@+id/publicKeyEditText"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="32dp"
+            app:labeledEditText_label="@string/activity_new_conversation_public_key_edit_text_label"/>
 
-    <com.dd.CircularProgressButton
-        android:id="@+id/nextButton"
-        android:layout_width="match_parent"
-        android:layout_height="50dp"
-        android:layout_marginTop="24dp"
-        android:layout_gravity="center_horizontal"
-        android:background="@color/signal_primary"
-        android:textColor="@color/white"
-        app:cpb_colorIndicator="@color/white"
-        app:cpb_colorProgress="@color/textsecure_primary"
-        app:cpb_cornerRadius="4dp"
-        app:cpb_selectorIdle="@drawable/progress_button_state"
-        app:cpb_textIdle="@string/activity_new_conversation_button_title" />
+        <TextView
+            android:id="@+id/explanationTextView"
+            style="@style/Signal.Text.Body"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="24dp"
+            android:text="@string/activity_new_conversation_public_key_explanation" />
 
-</LinearLayout>
+        <com.dd.CircularProgressButton
+            android:id="@+id/nextButton"
+            android:layout_width="match_parent"
+            android:layout_height="50dp"
+            android:layout_marginTop="24dp"
+            android:layout_marginBottom="32dp"
+            android:layout_gravity="center_horizontal"
+            android:background="@color/signal_primary"
+            android:textColor="@color/white"
+            app:cpb_colorIndicator="@color/white"
+            app:cpb_colorProgress="@color/textsecure_primary"
+            app:cpb_cornerRadius="4dp"
+            app:cpb_selectorIdle="@drawable/progress_button_state"
+            app:cpb_textIdle="@string/activity_new_conversation_button_title" />
+
+    </LinearLayout>
+
+</ScrollView>
\ No newline at end of file