5 files changed, 44 insertions, 13 deletions
diff --git a/OpenKeychain/src/main/res/layout/encrypt_activity.xml b/OpenKeychain/src/main/res/layout/encrypt_file_activity.xml
index 839bddc75..46daad28f 100644
--- a/OpenKeychain/src/main/res/layout/encrypt_activity.xml
+++ b/OpenKeychain/src/main/res/layout/encrypt_file_activity.xml
@@ -5,9 +5,9 @@
         android:id="@+id/drawer_layout"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        tools:context=".ui.EncryptActivity">
+        tools:context=".ui.EncryptFileActivity">
 
-    <include layout="@layout/encrypt_content"/>
+    <include layout="@layout/encrypt_file_content"/>
 
     <include layout="@layout/drawer_list" />
 
diff --git a/OpenKeychain/src/main/res/layout/encrypt_content.xml b/OpenKeychain/src/main/res/layout/encrypt_file_content.xml
index d029e7b83..34f6eadda 100644
--- a/OpenKeychain/src/main/res/layout/encrypt_content.xml
+++ b/OpenKeychain/src/main/res/layout/encrypt_file_content.xml
@@ -15,17 +15,10 @@
             android:layout_height="wrap_content"
             android:orientation="vertical" />
 
-    <android.support.v4.view.ViewPager
-        android:id="@+id/encrypt_pager_content"
+    <fragment
+        android:id="@+id/certify_key_fragment"
+        android:name="org.sufficientlysecure.keychain.ui.EncryptFileFragment"
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-        <android.support.v4.view.PagerTabStrip
-            android:id="@+id/encrypt_pager_tab_strip_content"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_gravity="top"
-            android:textColor="@color/emphasis" />
-    </android.support.v4.view.ViewPager>
+        android:layout_height="match_parent" />
 
 </LinearLayout>
 \ No newline at end of file
diff --git a/OpenKeychain/src/main/res/layout/encrypt_text_activity.xml b/OpenKeychain/src/main/res/layout/encrypt_text_activity.xml
new file mode 100644
index 000000000..5d5e16131
--- /dev/null
+++ b/OpenKeychain/src/main/res/layout/encrypt_text_activity.xml
@@ -0,0 +1,14 @@
+<?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"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        tools:context=".ui.EncryptTextActivity">
+
+    <include layout="@layout/encrypt_text_content"/>
+
+    <include layout="@layout/drawer_list" />
+
+</android.support.v4.widget.FixedDrawerLayout>
+\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/layout/encrypt_text_content.xml b/OpenKeychain/src/main/res/layout/encrypt_text_content.xml
new file mode 100644
index 000000000..a2497f9c6
--- /dev/null
+++ b/OpenKeychain/src/main/res/layout/encrypt_text_content.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@+id/content_frame"
+        android:layout_marginLeft="@dimen/drawer_content_padding"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+    <include layout="@layout/notify_area"/>
+
+    <FrameLayout
+        android:id="@+id/encrypt_pager_mode"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical" />
+
+    <fragment
+        android:id="@+id/certify_key_fragment"
+        android:name="org.sufficientlysecure.keychain.ui.EncryptMessageFragment"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+
+</LinearLayout>
+\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/layout/encrypt_message_fragment.xml b/OpenKeychain/src/main/res/layout/encrypt_text_fragment.xml
index fab983fa5..fab983fa5 100644
--- a/OpenKeychain/src/main/res/layout/encrypt_message_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/encrypt_text_fragment.xml