diff --git a/res/layout-sw400dp/activity_pn_mode.xml b/res/layout-sw400dp/activity_pn_mode.xml
index 66431151b..e31e269a2 100644
--- a/res/layout-sw400dp/activity_pn_mode.xml
+++ b/res/layout-sw400dp/activity_pn_mode.xml
@@ -1,116 +1,114 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
+<ScrollView
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/contentView"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
+    android:layout_height="wrap_content">
 
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="1"/>
-
-    <TextView
+    <LinearLayout
+        android:id="@+id/contentView"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginLeft="@dimen/very_large_spacing"
-        android:layout_marginRight="@dimen/very_large_spacing"
-        android:textSize="@dimen/very_large_font_size"
-        android:textStyle="bold"
-        android:textColor="@color/text"
-        android:text="Message Notifications" />
-
-    <TextView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="@dimen/very_large_spacing"
-        android:layout_marginTop="@dimen/large_spacing"
-        android:layout_marginRight="@dimen/very_large_spacing"
-        android:textSize="@dimen/medium_font_size"
-        android:textColor="@color/text"
-        android:text="There are two ways Session can notify you of new messages." />
-
-    <org.thoughtcrime.securesms.loki.views.PNModeView
-        android:id="@+id/fcmOptionView"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="@dimen/very_large_spacing"
-        android:layout_marginTop="@dimen/large_spacing"
-        android:layout_marginRight="@dimen/very_large_spacing"
-        android:padding="12dp"
-        android:orientation="vertical"
-        android:background="@drawable/pn_option_background">
+        android:orientation="vertical">
 
         <TextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:layout_marginLeft="@dimen/very_large_spacing"
+            android:layout_marginTop="@dimen/very_large_spacing"
+            android:layout_marginRight="@dimen/very_large_spacing"
+            android:textSize="@dimen/very_large_font_size"
+            android:textStyle="bold"
+            android:textColor="@color/text"
+            android:text="Message Notifications" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="@dimen/very_large_spacing"
+            android:layout_marginTop="@dimen/large_spacing"
+            android:layout_marginRight="@dimen/very_large_spacing"
             android:textSize="@dimen/medium_font_size"
             android:textColor="@color/text"
-            android:textStyle="bold"
-            android:text="Fast Mode" />
+            android:text="There are two ways Session can notify you of new messages." />
 
-        <TextView
+        <org.thoughtcrime.securesms.loki.views.PNModeView
+            android:id="@+id/fcmOptionView"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="4dp"
-            android:textSize="@dimen/very_small_font_size"
-            android:textColor="@color/text"
-            android:text="You’ll be notified of new messages reliably and immediately using Google’s notification servers. The contents of your messages, and who you’re messaging, are never exposed to Google." />
+            android:layout_marginLeft="@dimen/very_large_spacing"
+            android:layout_marginTop="@dimen/large_spacing"
+            android:layout_marginRight="@dimen/very_large_spacing"
+            android:padding="12dp"
+            android:orientation="vertical"
+            android:background="@drawable/pn_option_background">
 
-        <TextView
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:textSize="@dimen/medium_font_size"
+                android:textColor="@color/text"
+                android:textStyle="bold"
+                android:text="Fast Mode" />
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="4dp"
+                android:textSize="@dimen/very_small_font_size"
+                android:textColor="@color/text"
+                android:text="You’ll be notified of new messages reliably and immediately using Google’s notification servers. The contents of your messages, and who you’re messaging, are never exposed to Google." />
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="4dp"
+                android:textSize="@dimen/small_font_size"
+                android:textColor="@color/accent"
+                android:textStyle="bold"
+                android:text="@string/activity_pn_mode_recommended_option_tag" />
+
+        </org.thoughtcrime.securesms.loki.views.PNModeView>
+
+        <org.thoughtcrime.securesms.loki.views.PNModeView
+            android:id="@+id/backgroundPollingOptionView"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="4dp"
-            android:textSize="@dimen/small_font_size"
-            android:textColor="@color/accent"
-            android:textStyle="bold"
-            android:text="@string/activity_pn_mode_recommended_option_tag" />
+            android:layout_marginLeft="@dimen/very_large_spacing"
+            android:layout_marginTop="@dimen/small_spacing"
+            android:layout_marginRight="@dimen/very_large_spacing"
+            android:padding="12dp"
+            android:orientation="vertical"
+            android:background="@drawable/pn_option_background">
 
-    </org.thoughtcrime.securesms.loki.views.PNModeView>
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:textSize="@dimen/medium_font_size"
+                android:textColor="@color/text"
+                android:textStyle="bold"
+                android:text="Slow Mode" />
 
-    <org.thoughtcrime.securesms.loki.views.PNModeView
-        android:id="@+id/backgroundPollingOptionView"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="@dimen/very_large_spacing"
-        android:layout_marginTop="@dimen/small_spacing"
-        android:layout_marginRight="@dimen/very_large_spacing"
-        android:padding="12dp"
-        android:orientation="vertical"
-        android:background="@drawable/pn_option_background">
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="4dp"
+                android:textSize="@dimen/very_small_font_size"
+                android:textColor="@color/text"
+                android:text="Session will occasionally check for new messages in the background. Full metadata protection is guaranteed, but message notifications will be unreliable." />
 
-        <TextView
+        </org.thoughtcrime.securesms.loki.views.PNModeView>
+
+        <Button
+            style="@style/Widget.Session.Button.Common.ProminentFilled"
+            android:id="@+id/registerButton"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:textSize="@dimen/medium_font_size"
-            android:textColor="@color/text"
-            android:textStyle="bold"
-            android:text="Slow Mode" />
+            android:layout_height="@dimen/medium_button_height"
+            android:layout_marginLeft="@dimen/massive_spacing"
+            android:layout_marginTop="@dimen/very_large_spacing"
+            android:layout_marginRight="@dimen/massive_spacing"
+            android:layout_marginBottom="@dimen/onboarding_button_bottom_offset"
+            android:text="@string/continue_2" />
 
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="4dp"
-            android:textSize="@dimen/very_small_font_size"
-            android:textColor="@color/text"
-            android:text="Session will occasionally check for new messages in the background. Full metadata protection is guaranteed, but message notifications will be unreliable." />
+    </LinearLayout>
 
-    </org.thoughtcrime.securesms.loki.views.PNModeView>
-
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="1"/>
-
-    <Button
-        style="@style/Widget.Session.Button.Common.ProminentFilled"
-        android:id="@+id/registerButton"
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/medium_button_height"
-        android:layout_marginLeft="@dimen/massive_spacing"
-        android:layout_marginRight="@dimen/massive_spacing"
-        android:layout_marginBottom="@dimen/onboarding_button_bottom_offset"
-        android:text="@string/continue_2" />
-
-</LinearLayout>
\ No newline at end of file
+</ScrollView>
\ No newline at end of file
diff --git a/res/layout/activity_pn_mode.xml b/res/layout/activity_pn_mode.xml
index 2ab9cc860..2e8f12b7f 100644
--- a/res/layout/activity_pn_mode.xml
+++ b/res/layout/activity_pn_mode.xml
@@ -1,116 +1,114 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
+<ScrollView
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/contentView"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
+    android:layout_height="wrap_content">
 
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="1"/>
-
-    <TextView
+    <LinearLayout
+        android:id="@+id/contentView"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginLeft="@dimen/very_large_spacing"
-        android:layout_marginRight="@dimen/very_large_spacing"
-        android:textSize="@dimen/large_font_size"
-        android:textStyle="bold"
-        android:textColor="@color/text"
-        android:text="Message Notifications" />
-
-    <TextView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="@dimen/very_large_spacing"
-        android:layout_marginTop="@dimen/medium_spacing"
-        android:layout_marginRight="@dimen/very_large_spacing"
-        android:textSize="@dimen/medium_font_size"
-        android:textColor="@color/text"
-        android:text="There are two ways Session can notify you of new messages." />
-
-    <org.thoughtcrime.securesms.loki.views.PNModeView
-        android:id="@+id/fcmOptionView"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="@dimen/very_large_spacing"
-        android:layout_marginTop="@dimen/medium_spacing"
-        android:layout_marginRight="@dimen/very_large_spacing"
-        android:padding="12dp"
-        android:orientation="vertical"
-        android:background="@drawable/pn_option_background">
+        android:orientation="vertical">
 
         <TextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:layout_marginLeft="@dimen/very_large_spacing"
+            android:layout_marginTop="@dimen/very_large_spacing"
+            android:layout_marginRight="@dimen/very_large_spacing"
+            android:textSize="@dimen/large_font_size"
+            android:textStyle="bold"
+            android:textColor="@color/text"
+            android:text="Message Notifications" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="@dimen/very_large_spacing"
+            android:layout_marginTop="@dimen/medium_spacing"
+            android:layout_marginRight="@dimen/very_large_spacing"
             android:textSize="@dimen/medium_font_size"
             android:textColor="@color/text"
-            android:textStyle="bold"
-            android:text="Fast Mode" />
+            android:text="There are two ways Session can notify you of new messages." />
 
-        <TextView
+        <org.thoughtcrime.securesms.loki.views.PNModeView
+            android:id="@+id/fcmOptionView"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="4dp"
-            android:textSize="@dimen/very_small_font_size"
-            android:textColor="@color/text"
-            android:text="You’ll be notified of new messages reliably and immediately using Google’s notification servers. The contents of your messages, and who you’re messaging, are never exposed to Google." />
+            android:layout_marginLeft="@dimen/very_large_spacing"
+            android:layout_marginTop="@dimen/medium_spacing"
+            android:layout_marginRight="@dimen/very_large_spacing"
+            android:padding="12dp"
+            android:orientation="vertical"
+            android:background="@drawable/pn_option_background">
 
-        <TextView
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:textSize="@dimen/medium_font_size"
+                android:textColor="@color/text"
+                android:textStyle="bold"
+                android:text="Fast Mode" />
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="4dp"
+                android:textSize="@dimen/very_small_font_size"
+                android:textColor="@color/text"
+                android:text="You’ll be notified of new messages reliably and immediately using Google’s notification servers. The contents of your messages, and who you’re messaging, are never exposed to Google." />
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="4dp"
+                android:textSize="@dimen/small_font_size"
+                android:textColor="@color/accent"
+                android:textStyle="bold"
+                android:text="@string/activity_pn_mode_recommended_option_tag" />
+
+        </org.thoughtcrime.securesms.loki.views.PNModeView>
+
+        <org.thoughtcrime.securesms.loki.views.PNModeView
+            android:id="@+id/backgroundPollingOptionView"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="4dp"
-            android:textSize="@dimen/small_font_size"
-            android:textColor="@color/accent"
-            android:textStyle="bold"
-            android:text="@string/activity_pn_mode_recommended_option_tag" />
+            android:layout_marginLeft="@dimen/very_large_spacing"
+            android:layout_marginTop="@dimen/small_spacing"
+            android:layout_marginRight="@dimen/very_large_spacing"
+            android:padding="12dp"
+            android:orientation="vertical"
+            android:background="@drawable/pn_option_background">
 
-    </org.thoughtcrime.securesms.loki.views.PNModeView>
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:textSize="@dimen/medium_font_size"
+                android:textColor="@color/text"
+                android:textStyle="bold"
+                android:text="Slow Mode" />
 
-    <org.thoughtcrime.securesms.loki.views.PNModeView
-        android:id="@+id/backgroundPollingOptionView"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="@dimen/very_large_spacing"
-        android:layout_marginTop="@dimen/small_spacing"
-        android:layout_marginRight="@dimen/very_large_spacing"
-        android:padding="12dp"
-        android:orientation="vertical"
-        android:background="@drawable/pn_option_background">
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="4dp"
+                android:textSize="@dimen/very_small_font_size"
+                android:textColor="@color/text"
+                android:text="Session will occasionally check for new messages in the background. Full metadata protection is guaranteed, but message notifications will be unreliable." />
 
-        <TextView
+        </org.thoughtcrime.securesms.loki.views.PNModeView>
+
+        <Button
+            style="@style/Widget.Session.Button.Common.ProminentFilled"
+            android:id="@+id/registerButton"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:textSize="@dimen/medium_font_size"
-            android:textColor="@color/text"
-            android:textStyle="bold"
-            android:text="Slow Mode" />
+            android:layout_height="@dimen/medium_button_height"
+            android:layout_marginLeft="@dimen/massive_spacing"
+            android:layout_marginTop="@dimen/very_large_spacing"
+            android:layout_marginRight="@dimen/massive_spacing"
+            android:layout_marginBottom="@dimen/onboarding_button_bottom_offset"
+            android:text="@string/continue_2" />
 
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="4dp"
-            android:textSize="@dimen/very_small_font_size"
-            android:textColor="@color/text"
-            android:text="Session will occasionally check for new messages in the background. Full metadata protection is guaranteed, but message notifications will be unreliable." />
+    </LinearLayout>
 
-    </org.thoughtcrime.securesms.loki.views.PNModeView>
-
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="1"/>
-
-    <Button
-        style="@style/Widget.Session.Button.Common.ProminentFilled"
-        android:id="@+id/registerButton"
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/medium_button_height"
-        android:layout_marginLeft="@dimen/massive_spacing"
-        android:layout_marginRight="@dimen/massive_spacing"
-        android:layout_marginBottom="@dimen/onboarding_button_bottom_offset"
-        android:text="@string/continue_2" />
-
-</LinearLayout>
\ No newline at end of file
+</ScrollView>
\ No newline at end of file