diff --git a/OpenPGP-Keychain/src/main/res/layout/decrypt_file_fragment.xml b/OpenPGP-Keychain/src/main/res/layout/decrypt_file_fragment.xml
index 132313ca8..e7d08f0fa 100644
--- a/OpenPGP-Keychain/src/main/res/layout/decrypt_file_fragment.xml
+++ b/OpenPGP-Keychain/src/main/res/layout/decrypt_file_fragment.xml
@@ -39,13 +39,6 @@
             bootstrapbutton:bb_type="default" />
     </LinearLayout>
 
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal">
-
-    </LinearLayout>
-
     <CheckBox
         android:id="@+id/decrypt_file_delete_after_decryption"
         android:layout_width="wrap_content"
@@ -54,7 +47,8 @@
 
     <RelativeLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="match_parent"
+        android:padding="4dp">
 
         <TextView
             style="@style/SectionHeader"
@@ -78,6 +72,4 @@
             android:layout_alignParentStart="true" />
 
     </RelativeLayout>
-
-
 </LinearLayout>
\ No newline at end of file
diff --git a/OpenPGP-Keychain/src/main/res/layout/decrypt_message_fragment.xml b/OpenPGP-Keychain/src/main/res/layout/decrypt_message_fragment.xml
index 23ae95660..bfcc42da5 100644
--- a/OpenPGP-Keychain/src/main/res/layout/decrypt_message_fragment.xml
+++ b/OpenPGP-Keychain/src/main/res/layout/decrypt_message_fragment.xml
@@ -7,7 +7,7 @@
 
     <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
+        android:layout_height="wrap_content"
         android:paddingTop="4dp"
         android:paddingLeft="10dp"
         android:paddingRight="10dp"
@@ -18,7 +18,7 @@
         <EditText
             android:id="@+id/message"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
+            android:layout_height="0dip"
             android:gravity="top"
             android:inputType="text|textCapSentences|textMultiLine|textLongMessage"
             android:scrollHorizontally="true"
diff --git a/OpenPGP-Keychain/src/main/res/layout/encrypt_asymmetric_fragment.xml b/OpenPGP-Keychain/src/main/res/layout/encrypt_asymmetric_fragment.xml
new file mode 100644
index 000000000..24932508b
--- /dev/null
+++ b/OpenPGP-Keychain/src/main/res/layout/encrypt_asymmetric_fragment.xml
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:bootstrapbutton="http://schemas.android.com/apk/res-auto"
+    xmlns:custom="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical"
+    android:padding="4dp">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal">
+
+        <CheckBox
+            android:id="@+id/sign"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:text="@string/label_sign" />
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:paddingLeft="16dp"
+            android:paddingRight="4dip">
+
+            <TextView
+                android:id="@+id/mainUserId"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="right"
+                android:ellipsize="end"
+                android:singleLine="true"
+                android:text="@string/label_sign_user_id"
+                android:textAppearance="?android:attr/textAppearanceMedium" />
+
+            <TextView
+                android:id="@+id/mainUserIdRest"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="right"
+                android:ellipsize="end"
+                android:singleLine="true"
+                android:text="@string/label_sign_email"
+                android:textAppearance="?android:attr/textAppearanceSmall" />
+        </LinearLayout>
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:paddingBottom="3dip">
+
+        <TextView
+            android:id="@+id/label_selectPublicKeys"
+            android:layout_width="0dip"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:layout_weight="1"
+            android:text="@string/label_select_public_keys"
+            android:textAppearance="?android:attr/textAppearanceMedium" />
+
+        <com.beardedhen.androidbootstrap.BootstrapButton
+            android:id="@+id/btn_selectEncryptKeys"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:layout_margin="4dp"
+            android:text="@string/btn_select_encrypt_keys"
+            bootstrapbutton:bb_icon_left="fa-user"
+            bootstrapbutton:bb_size="default"
+            bootstrapbutton:bb_type="default" />
+    </LinearLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/OpenPGP-Keychain/src/main/res/layout/encrypt_file_fragment.xml b/OpenPGP-Keychain/src/main/res/layout/encrypt_file_fragment.xml
new file mode 100644
index 000000000..24a67acb7
--- /dev/null
+++ b/OpenPGP-Keychain/src/main/res/layout/encrypt_file_fragment.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:bootstrapbutton="http://schemas.android.com/apk/res-auto"
+    xmlns:custom="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:paddingTop="4dp"
+    android:paddingLeft="10dp"
+    android:paddingRight="10dp"
+    android:orientation="vertical">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal">
+
+        <EditText
+            android:id="@+id/filename"
+            android:layout_width="0dip"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:gravity="top|left"
+            android:inputType="textMultiLine|textUri"
+            android:lines="4"
+            android:maxLines="10"
+            android:minLines="2"
+            android:scrollbars="vertical" />
+
+        <com.beardedhen.androidbootstrap.BootstrapButton
+            android:id="@+id/btn_browse"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_margin="4dp"
+            bootstrapbutton:bb_icon_left="fa-folder-open"
+            bootstrapbutton:bb_roundedCorners="true"
+            bootstrapbutton:bb_size="default"
+            bootstrapbutton:bb_type="default" />
+    </LinearLayout>
+
+    <org.sufficientlysecure.keychain.ui.widget.FoldableLinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        custom:foldedLabel="@string/btn_encryption_advanced_settings_show"
+        custom:unFoldedLabel="@string/btn_encryption_advanced_settings_hide"
+        custom:foldedIcon="fa-chevron-right"
+        custom:unFoldedIcon="fa-chevron-down">
+
+        <include layout="@layout/encrypt_content_adv_settings" />
+
+    </org.sufficientlysecure.keychain.ui.widget.FoldableLinearLayout>
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:padding="4dp">
+
+        <TextView
+            style="@style/SectionHeader"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/section_encrypt_and_or_sign"
+            android:layout_above="@+id/decrypt_file_action_decrypt"
+            android:layout_alignParentLeft="true"
+            android:layout_alignParentStart="true" />
+
+        <com.beardedhen.androidbootstrap.BootstrapButton
+            android:id="@+id/action_encrypt_file"
+            android:layout_width="match_parent"
+            android:layout_height="60dp"
+            android:padding="4dp"
+            android:visibility="gone"
+            android:text="@string/btn_encrypt_file"
+            bootstrapbutton:bb_icon_left="fa-lock"
+            bootstrapbutton:bb_type="info" />
+
+    </RelativeLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/OpenPGP-Keychain/src/main/res/layout/encrypt_message_fragment.xml b/OpenPGP-Keychain/src/main/res/layout/encrypt_message_fragment.xml
new file mode 100644
index 000000000..bc2a2b4a6
--- /dev/null
+++ b/OpenPGP-Keychain/src/main/res/layout/encrypt_message_fragment.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:bootstrapbutton="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:fillViewport="true">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingTop="4dp"
+        android:paddingLeft="10dp"
+        android:paddingRight="10dp"
+        android:orientation="vertical">
+
+        <EditText
+            android:id="@+id/message"
+            android:layout_width="match_parent"
+            android:layout_height="0dip"
+            android:gravity="top"
+            android:inputType="text|textCapSentences|textMultiLine|textLongMessage"
+            android:hint="@string/encrypt_content_edit_text_hint"
+            android:layout_weight="1" />
+
+        <TextView
+            style="@style/SectionHeader"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="4dp"
+            android:text="@string/section_encrypt_and_or_sign" />
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:padding="4dp">
+
+            <com.beardedhen.androidbootstrap.BootstrapButton
+                android:id="@+id/action_encrypt_share"
+                android:layout_width="match_parent"
+                android:layout_height="60dp"
+                android:padding="4dp"
+                android:layout_weight="1"
+                android:text="@string/btn_share"
+                bootstrapbutton:bb_icon_left="fa-share-square"
+                bootstrapbutton:bb_type="info" />
+
+            <com.beardedhen.androidbootstrap.BootstrapButton
+                android:id="@+id/action_encrypt_clipboard"
+                android:layout_width="match_parent"
+                android:layout_height="60dp"
+                android:padding="4dp"
+                android:layout_weight="1"
+                android:text="@string/btn_clipboard"
+                bootstrapbutton:bb_icon_left="fa-clipboard"
+                bootstrapbutton:bb_type="info" />
+
+        </LinearLayout>
+    </LinearLayout>
+</ScrollView>
diff --git a/OpenPGP-Keychain/src/main/res/layout/encrypt_symmetric_fragment.xml b/OpenPGP-Keychain/src/main/res/layout/encrypt_symmetric_fragment.xml
new file mode 100644
index 000000000..019c1cddf
--- /dev/null
+++ b/OpenPGP-Keychain/src/main/res/layout/encrypt_symmetric_fragment.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TableLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/modeSymmetric"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:padding="4dp"
+    android:stretchColumns="1">
+
+    <TableRow>
+
+        <TextView
+            android:id="@+id/label_passphrase"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:paddingRight="10dip"
+            android:text="@string/label_passphrase"
+            android:textAppearance="?android:attr/textAppearanceMedium" />
+
+        <EditText
+            android:id="@+id/passphrase"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:inputType="textPassword" />
+    </TableRow>
+
+    <TableRow>
+
+        <TextView
+            android:id="@+id/label_passphraseAgain"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:paddingRight="10dip"
+            android:text="@string/label_passphrase_again"
+            android:textAppearance="?android:attr/textAppearanceMedium" />
+
+        <EditText
+            android:id="@+id/passphraseAgain"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:inputType="textPassword" />
+    </TableRow>
+</TableLayout>
\ No newline at end of file