1 files changed, 32 insertions, 8 deletions
diff --git a/OpenKeychain/src/main/res/layout/encrypt_text_activity.xml b/OpenKeychain/src/main/res/layout/encrypt_text_activity.xml
index 5d5e16131..fd7fd6672 100644
--- a/OpenKeychain/src/main/res/layout/encrypt_text_activity.xml
+++ b/OpenKeychain/src/main/res/layout/encrypt_text_activity.xml
@@ -1,14 +1,38 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.v4.widget.FixedDrawerLayout
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:tools="http://schemas.android.com/tools"
-        android:id="@+id/drawer_layout"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <include
+        android:id="@+id/toolbar_include"
+        layout="@layout/toolbar_standalone" />
+
+    <!--
+        fitsSystemWindows and layout_marginTop from
+        https://medium.com/@ngdelamo/using-drawerlayout-the-material-way-i-716bba2b5705
+    -->
+    <LinearLayout
+        android:layout_below="@id/toolbar_include"
+        android:id="@+id/content_frame"
+        android:fitsSystemWindows="true"
+        android:layout_marginTop="-25dp"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        tools:context=".ui.EncryptTextActivity">
+        android:orientation="vertical">
+
+        <include layout="@layout/notify_area" />
 
-    <include layout="@layout/encrypt_text_content"/>
+        <FrameLayout
+            android:id="@+id/encrypt_pager_mode"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical" />
 
-    <include layout="@layout/drawer_list" />
+        <fragment
+            android:id="@+id/encrypt_text_fragment"
+            android:name="org.sufficientlysecure.keychain.ui.EncryptTextFragment"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent" />
 
-</android.support.v4.widget.FixedDrawerLayout>
-\ No newline at end of file
+    </LinearLayout>
+</RelativeLayout>
+\ No newline at end of file