diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/helper/ActionBarHelper.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/helper/ActionBarHelper.java
index 91e50637e..a26df556d 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/helper/ActionBarHelper.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/helper/ActionBarHelper.java
@@ -37,7 +37,6 @@ public class ActionBarHelper {
      * @param activity
      */
     public static void setBackButton(ActionBarActivity activity) {
-        // set actionbar without home button if called from another app
         final ActionBar actionBar = activity.getSupportActionBar();
         Log.d(Constants.TAG, "calling package (only set when using startActivityForResult)="
                 + activity.getCallingPackage());
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/DrawerActivity.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/DrawerActivity.java
index c0fd53007..985f6c309 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/DrawerActivity.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/DrawerActivity.java
@@ -21,18 +21,17 @@ import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
 import android.content.res.Configuration;
+import android.graphics.Color;
 import android.os.Bundle;
 import android.support.v4.app.ActionBarDrawerToggle;
 import android.support.v4.view.GravityCompat;
 import android.support.v4.widget.DrawerLayout;
 import android.support.v7.app.ActionBarActivity;
 import android.view.*;
-import android.widget.AdapterView;
-import android.widget.ArrayAdapter;
-import android.widget.ListView;
-import android.widget.TextView;
+import android.widget.*;
 import com.beardedhen.androidbootstrap.FontAwesomeText;
 import org.sufficientlysecure.keychain.R;
+import org.sufficientlysecure.keychain.helper.ActionBarHelper;
 import org.sufficientlysecure.keychain.service.remote.RegisteredAppsListActivity;
 
 public class DrawerActivity extends ActionBarActivity {
@@ -42,6 +41,7 @@ public class DrawerActivity extends ActionBarActivity {
 
     private CharSequence mDrawerTitle;
     private CharSequence mTitle;
+    private boolean mIsDrawerLocked = false;
 
     private static Class[] mItemsClass = new Class[]{KeyListActivity.class,
             EncryptActivity.class, DecryptActivity.class, ImportKeysActivity.class,
@@ -55,10 +55,22 @@ public class DrawerActivity extends ActionBarActivity {
         mDrawerTitle = getString(R.string.app_name);
         mDrawerLayout = (DrawerLayout) findViewById(R.id.drawer_layout);
         mDrawerList = (ListView) findViewById(R.id.left_drawer);
+        ViewGroup viewGroup = (ViewGroup) findViewById(R.id.content_frame);
+        int leftMarginLoaded = ((ViewGroup.MarginLayoutParams) viewGroup.getLayoutParams()).leftMargin;
+        int leftMarginInTablets = (int) getResources().getDimension(R.dimen.drawer_size);
+        int errorInMarginAllowed = 5;
 
-        // set a custom shadow that overlays the main content when the drawer
-        // opens
-        mDrawerLayout.setDrawerShadow(R.drawable.drawer_shadow, GravityCompat.START);
+        // if the left margin of the loaded layout is close to the
+        // one used in tablets then set drawer as open and locked
+        if( Math.abs(leftMarginLoaded - leftMarginInTablets) < errorInMarginAllowed) {
+            mDrawerLayout.setDrawerLockMode(DrawerLayout.LOCK_MODE_LOCKED_OPEN, mDrawerList);
+            mDrawerLayout.setScrimColor(Color.TRANSPARENT);
+            mIsDrawerLocked = true;
+        } else {
+            // set a custom shadow that overlays the main content when the drawer opens
+            mDrawerLayout.setDrawerShadow(R.drawable.drawer_shadow, GravityCompat.START);
+            mIsDrawerLocked = false;
+        }
 
         NavItem mItemIconTexts[] = new NavItem[]{
                 new NavItem("fa-user", getString(R.string.nav_contacts)),
@@ -73,8 +85,11 @@ public class DrawerActivity extends ActionBarActivity {
         mDrawerList.setOnItemClickListener(new DrawerItemClickListener());
 
         // enable ActionBar app icon to behave as action to toggle nav drawer
-        getSupportActionBar().setDisplayHomeAsUpEnabled(true);
-        getSupportActionBar().setHomeButtonEnabled(true);
+        // if the drawer is not locked
+        if ( !mIsDrawerLocked ) {
+            getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+            getSupportActionBar().setHomeButtonEnabled(true);
+        }
 
         // ActionBarDrawerToggle ties together the the proper interactions
         // between the sliding drawer and the action bar app icon
@@ -86,19 +101,8 @@ public class DrawerActivity extends ActionBarActivity {
         ) {
             public void onDrawerClosed(View view) {
                 getSupportActionBar().setTitle(mTitle);
-                // creates call to onPrepareOptionsMenu()
-                supportInvalidateOptionsMenu();
 
-                // call intent activity if selected
-                if (mSelectedItem != null) {
-                    finish();
-                    overridePendingTransition(0, 0);
-
-                    Intent intent = new Intent(DrawerActivity.this, mSelectedItem);
-                    startActivity(intent);
-                    // disable animation of activity start
-                    overridePendingTransition(0, 0);
-                }
+                callIntentForSelectedItem();
             }
 
             public void onDrawerOpened(View drawerView) {
@@ -108,13 +112,37 @@ public class DrawerActivity extends ActionBarActivity {
                 supportInvalidateOptionsMenu();
             }
         };
-        mDrawerLayout.setDrawerListener(mDrawerToggle);
+        if ( !mIsDrawerLocked ) {
+            mDrawerLayout.setDrawerListener(mDrawerToggle);
+        }
 
+        if ( mIsDrawerLocked ) {
+            // If the drawer is locked open make it un-focusable
+            // so that it doesn't consume all the Back button presses
+            mDrawerLayout.setFocusableInTouchMode(false);
+        }
         // if (savedInstanceState == null) {
         // selectItem(0);
         // }
     }
 
+    private void callIntentForSelectedItem() {
+        // creates call to onPrepareOptionsMenu()
+        supportInvalidateOptionsMenu();
+
+        // call intent activity if selected
+        if (mSelectedItem != null) {
+            finish();
+            overridePendingTransition(0, 0);
+
+            Intent intent = new Intent(this, mSelectedItem);
+            startActivity(intent);
+
+            // disable animation of activity start
+            overridePendingTransition(0, 0);
+        }
+    }
+
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
         menu.add(42, MENU_ID_PREFERENCE, 100, R.string.menu_preferences);
@@ -185,10 +213,18 @@ public class DrawerActivity extends ActionBarActivity {
     private void selectItem(int position) {
         // update selected item and title, then close the drawer
         mDrawerList.setItemChecked(position, true);
-        // setTitle(mDrawerTitles[position]);
-        mDrawerLayout.closeDrawer(mDrawerList);
         // set selected class
         mSelectedItem = mItemsClass[position];
+
+        // setTitle(mDrawerTitles[position]);
+        // If drawer isn't locked just close the drawer and
+        // it will move to the selected item by itself (via drawer toggle listener)
+        if ( !mIsDrawerLocked ) {
+            mDrawerLayout.closeDrawer(mDrawerList);
+        // else move to the selected item yourself
+        } else {
+            callIntentForSelectedItem();
+        }
     }
 
     /**
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListActivity.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListActivity.java
index 5ff4dbdeb..57709350e 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListActivity.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListActivity.java
@@ -53,8 +53,11 @@ public class KeyListActivity extends DrawerActivity {
     public boolean onOptionsItemSelected(MenuItem item) {
         switch (item.getItemId()) {
             case R.id.menu_key_list_import:
+
+                overridePendingTransition(0, 0);
                 Intent intentImport = new Intent(this, ImportKeysActivity.class);
                 startActivityForResult(intentImport, 0);
+                overridePendingTransition(0, 0);
 
                 return true;
             case R.id.menu_key_list_export:
diff --git a/OpenPGP-Keychain/src/main/res/layout-large/api_apps_list_activity.xml b/OpenPGP-Keychain/src/main/res/layout-large/api_apps_list_activity.xml
new file mode 100644
index 000000000..c0021261e
--- /dev/null
+++ b/OpenPGP-Keychain/src/main/res/layout-large/api_apps_list_activity.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="horizontal" >
+    <android.support.v4.widget.DrawerLayout
+            android:id="@+id/drawer_layout"
+
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
+
+
+        <include layout="@layout/drawer_list"/>
+
+    </android.support.v4.widget.DrawerLayout>
+
+    <include layout="@layout/api_apps_list_content"/>
+
+</FrameLayout>
\ No newline at end of file
diff --git a/OpenPGP-Keychain/src/main/res/layout-large/decrypt_activity.xml b/OpenPGP-Keychain/src/main/res/layout-large/decrypt_activity.xml
new file mode 100644
index 000000000..26aed0831
--- /dev/null
+++ b/OpenPGP-Keychain/src/main/res/layout-large/decrypt_activity.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:orientation="horizontal"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+    <android.support.v4.widget.DrawerLayout
+            xmlns:bootstrapbutton="http://schemas.android.com/apk/res-auto"
+            android:id="@+id/drawer_layout"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
+
+        <include layout="@layout/drawer_list"/>
+
+    </android.support.v4.widget.DrawerLayout>
+
+    <include layout="@layout/decrypt_content"/>
+
+</FrameLayout>
\ No newline at end of file
diff --git a/OpenPGP-Keychain/src/main/res/layout-large/encrypt_activity.xml b/OpenPGP-Keychain/src/main/res/layout-large/encrypt_activity.xml
new file mode 100644
index 000000000..7d0d44074
--- /dev/null
+++ b/OpenPGP-Keychain/src/main/res/layout-large/encrypt_activity.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:orientation="horizontal"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+    <android.support.v4.widget.DrawerLayout
+        xmlns:bootstrapbutton="http://schemas.android.com/apk/res-auto"
+        xmlns:fontawesometext="http://schemas.android.com/apk/res-auto"
+        android:id="@+id/drawer_layout"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <include layout="@layout/drawer_list"/>
+
+    </android.support.v4.widget.DrawerLayout>
+
+    <include layout="@layout/encrypt_content"/>
+</FrameLayout>
\ No newline at end of file
diff --git a/OpenPGP-Keychain/src/main/res/layout-large/import_keys_activity.xml b/OpenPGP-Keychain/src/main/res/layout-large/import_keys_activity.xml
new file mode 100644
index 000000000..2cb408441
--- /dev/null
+++ b/OpenPGP-Keychain/src/main/res/layout-large/import_keys_activity.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:orientation="horizontal"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+    <android.support.v4.widget.DrawerLayout
+            xmlns:bootstrapbutton="http://schemas.android.com/apk/res-auto"
+            android:id="@+id/drawer_layout"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
+
+
+        <include layout="@layout/drawer_list"/>
+
+    </android.support.v4.widget.DrawerLayout>
+
+    <include layout="@layout/import_keys_content"/>
+
+</FrameLayout>
\ No newline at end of file
diff --git a/OpenPGP-Keychain/src/main/res/layout-large/key_list_activity.xml b/OpenPGP-Keychain/src/main/res/layout-large/key_list_activity.xml
new file mode 100644
index 000000000..6636f12ff
--- /dev/null
+++ b/OpenPGP-Keychain/src/main/res/layout-large/key_list_activity.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:orientation="horizontal"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+    <android.support.v4.widget.DrawerLayout
+        android:id="@+id/drawer_layout"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <include layout="@layout/drawer_list"/>
+
+    </android.support.v4.widget.DrawerLayout>
+
+    <include layout="@layout/key_list_content"/>
+
+</FrameLayout>
\ No newline at end of file
diff --git a/OpenPGP-Keychain/src/main/res/layout/api_apps_list_activity.xml b/OpenPGP-Keychain/src/main/res/layout/api_apps_list_activity.xml
index 71fbcfb12..9f95e9f3b 100644
--- a/OpenPGP-Keychain/src/main/res/layout/api_apps_list_activity.xml
+++ b/OpenPGP-Keychain/src/main/res/layout/api_apps_list_activity.xml
@@ -4,16 +4,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent" >
 
-    <FrameLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent" >
-
-        <fragment
-            android:id="@+id/crypto_consumers_list_fragment"
-            android:name="org.sufficientlysecure.keychain.service.remote.RegisteredAppsListFragment"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent" />
-    </FrameLayout>
+    <include layout="@layout/api_apps_list_content"/>
 
     <include layout="@layout/drawer_list" />
 
diff --git a/OpenPGP-Keychain/src/main/res/layout/api_apps_list_content.xml b/OpenPGP-Keychain/src/main/res/layout/api_apps_list_content.xml
new file mode 100644
index 000000000..b8606b929
--- /dev/null
+++ b/OpenPGP-Keychain/src/main/res/layout/api_apps_list_content.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout
+        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">
+
+    <fragment
+            android:id="@+id/crypto_consumers_list_fragment"
+            android:name="org.sufficientlysecure.keychain.service.remote.RegisteredAppsListFragment"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"/>
+</FrameLayout>
\ No newline at end of file
diff --git a/OpenPGP-Keychain/src/main/res/layout/decrypt_activity.xml b/OpenPGP-Keychain/src/main/res/layout/decrypt_activity.xml
index 25c7c000c..c4709a67e 100644
--- a/OpenPGP-Keychain/src/main/res/layout/decrypt_activity.xml
+++ b/OpenPGP-Keychain/src/main/res/layout/decrypt_activity.xml
@@ -5,206 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <ScrollView
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:fillViewport="true"
-        android:orientation="vertical">
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical"
-            android:paddingTop="4dp"
-            android:paddingLeft="10dp"
-            android:paddingRight="10dp">
-
-            <RelativeLayout
-                android:id="@+id/signature"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:clickable="true"
-                android:orientation="horizontal"
-                android:padding="4dp"
-                android:paddingLeft="10dp"
-                android:paddingRight="10dp">
-
-                <RelativeLayout
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:id="@+id/relativeLayout">
-
-                    <ImageView
-                        android:id="@+id/ic_signature"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:src="@drawable/signed_large" />
-
-                    <ImageView
-                        android:id="@+id/ic_signature_status"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:src="@drawable/overlay_error" />
-                </RelativeLayout>
-
-                <com.beardedhen.androidbootstrap.BootstrapButton
-                    android:id="@+id/lookup_key"
-                    android:visibility="gone"
-                    android:layout_width="wrap_content"
-                    android:layout_height="50dp"
-                    android:padding="4dp"
-                    android:text="@string/btn_lookup_key"
-                    bootstrapbutton:bb_icon_left="fa-download"
-                    bootstrapbutton:bb_type="info"
-                    bootstrapbutton:bb_size="small"
-                    android:layout_alignParentTop="true"
-                    android:layout_alignParentRight="true"
-                    android:layout_alignParentEnd="true" />
-
-                <TextView
-                    android:id="@+id/mainUserId"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="left"
-                    android:text="@string/label_main_user_id"
-                    android:textAppearance="?android:attr/textAppearanceMedium"
-                    android:layout_toRightOf="@+id/relativeLayout" />
-
-                <TextView
-                    android:id="@+id/mainUserIdRest"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="left"
-                    android:text="Main User Id Rest"
-                    android:textAppearance="?android:attr/textAppearanceSmall"
-                    android:layout_below="@+id/mainUserId"
-                    android:layout_toRightOf="@+id/relativeLayout" />
-            </RelativeLayout>
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal">
-
-                <ImageView
-                    android:id="@+id/sourcePrevious"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:src="@drawable/ic_previous" />
-
-                <TextView
-                    android:id="@+id/sourceLabel"
-                    style="@style/SectionHeader"
-                    android:layout_width="0dip"
-                    android:layout_height="match_parent"
-                    android:layout_weight="1"
-                    android:gravity="center_horizontal|center_vertical"
-                    android:text="@string/label_message"
-                    android:textAppearance="?android:attr/textAppearanceMedium" />
-
-                <ImageView
-                    android:id="@+id/sourceNext"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:src="@drawable/ic_next" />
-            </LinearLayout>
-
-            <ViewFlipper
-                android:id="@+id/source"
-                android:layout_width="match_parent"
-                android:layout_height="0dip"
-                android:layout_weight="1">
-
-                <LinearLayout
-                    android:id="@+id/sourceMessage"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:orientation="vertical"
-                    android:padding="4dp">
-
-                    <EditText
-                        android:id="@+id/message"
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent"
-                        android:gravity="top"
-                        android:inputType="text|textCapSentences|textMultiLine|textLongMessage"
-                        android:scrollHorizontally="true" />
-                </LinearLayout>
-
-                <LinearLayout
-                    android:id="@+id/sourceFile"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:orientation="vertical"
-                    android:padding="4dp">
-
-                    <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>
-
-                    <LinearLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:orientation="horizontal">
-
-                        <CheckBox
-                            android:id="@+id/deleteAfterDecryption"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_gravity="center_vertical"
-                            android:text="@string/label_delete_after_decryption" />
-                    </LinearLayout>
-                </LinearLayout>
-            </ViewFlipper>
-
-            <TextView
-                style="@style/SectionHeader"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginBottom="4dp"
-                android:text="@string/section_decrypt_verify" />
-
-            <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_decrypt"
-                    android:layout_width="match_parent"
-                    android:layout_height="60dp"
-                    android:padding="4dp"
-                    android:text="@string/btn_decrypt_verify"
-                    bootstrapbutton:bb_icon_left="fa-unlock"
-                    bootstrapbutton:bb_type="info" />
-            </LinearLayout>
-        </LinearLayout>
-    </ScrollView>
+    <include layout="@layout/decrypt_content"/>
 
     <include layout="@layout/drawer_list" />
 
diff --git a/OpenPGP-Keychain/src/main/res/layout/decrypt_content.xml b/OpenPGP-Keychain/src/main/res/layout/decrypt_content.xml
new file mode 100644
index 000000000..a847d9e46
--- /dev/null
+++ b/OpenPGP-Keychain/src/main/res/layout/decrypt_content.xml
@@ -0,0 +1,205 @@
+<?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:id="@+id/content_frame"
+        android:layout_marginLeft="@dimen/drawer_content_padding"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:fillViewport="true"
+        android:orientation="vertical">
+
+    <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:paddingTop="4dp"
+            android:paddingLeft="10dp"
+            android:paddingRight="10dp">
+
+        <RelativeLayout
+                android:id="@+id/signature"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:clickable="true"
+                android:orientation="horizontal"
+                android:padding="4dp"
+                android:paddingLeft="10dp"
+                android:paddingRight="10dp">
+
+            <RelativeLayout
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:id="@+id/relativeLayout">
+
+                <ImageView
+                        android:id="@+id/ic_signature"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:src="@drawable/signed_large"/>
+
+                <ImageView
+                        android:id="@+id/ic_signature_status"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:src="@drawable/overlay_error"/>
+            </RelativeLayout>
+
+            <com.beardedhen.androidbootstrap.BootstrapButton
+                    android:id="@+id/lookup_key"
+                    android:visibility="gone"
+                    android:layout_width="wrap_content"
+                    android:layout_height="50dp"
+                    android:padding="4dp"
+                    android:text="@string/btn_lookup_key"
+                    bootstrapbutton:bb_icon_left="fa-download"
+                    bootstrapbutton:bb_type="info"
+                    bootstrapbutton:bb_size="small"
+                    android:layout_alignParentTop="true"
+                    android:layout_alignParentRight="true"
+                    android:layout_alignParentEnd="true"/>
+
+            <TextView
+                    android:id="@+id/mainUserId"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="left"
+                    android:text="@string/label_main_user_id"
+                    android:textAppearance="?android:attr/textAppearanceMedium"
+                    android:layout_toRightOf="@+id/relativeLayout"/>
+
+            <TextView
+                    android:id="@+id/mainUserIdRest"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="left"
+                    android:text="Main User Id Rest"
+                    android:textAppearance="?android:attr/textAppearanceSmall"
+                    android:layout_below="@+id/mainUserId"
+                    android:layout_toRightOf="@+id/relativeLayout"/>
+        </RelativeLayout>
+
+        <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal">
+
+            <ImageView
+                    android:id="@+id/sourcePrevious"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/ic_previous"/>
+
+            <TextView
+                    android:id="@+id/sourceLabel"
+                    style="@style/SectionHeader"
+                    android:layout_width="0dip"
+                    android:layout_height="match_parent"
+                    android:layout_weight="1"
+                    android:gravity="center_horizontal|center_vertical"
+                    android:text="@string/label_message"
+                    android:textAppearance="?android:attr/textAppearanceMedium"/>
+
+            <ImageView
+                    android:id="@+id/sourceNext"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/ic_next"/>
+        </LinearLayout>
+
+        <ViewFlipper
+                android:id="@+id/source"
+                android:layout_width="match_parent"
+                android:layout_height="0dip"
+                android:layout_weight="1">
+
+            <LinearLayout
+                    android:id="@+id/sourceMessage"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:orientation="vertical"
+                    android:padding="4dp">
+
+                <EditText
+                        android:id="@+id/message"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:gravity="top"
+                        android:inputType="text|textCapSentences|textMultiLine|textLongMessage"
+                        android:scrollHorizontally="true"/>
+            </LinearLayout>
+
+            <LinearLayout
+                    android:id="@+id/sourceFile"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:orientation="vertical"
+                    android:padding="4dp">
+
+                <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>
+
+                <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:orientation="horizontal">
+
+                    <CheckBox
+                            android:id="@+id/deleteAfterDecryption"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_gravity="center_vertical"
+                            android:text="@string/label_delete_after_decryption"/>
+                </LinearLayout>
+            </LinearLayout>
+        </ViewFlipper>
+
+        <TextView
+                style="@style/SectionHeader"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="4dp"
+                android:text="@string/section_decrypt_verify"/>
+
+        <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_decrypt"
+                    android:layout_width="match_parent"
+                    android:layout_height="60dp"
+                    android:padding="4dp"
+                    android:text="@string/btn_decrypt_verify"
+                    bootstrapbutton:bb_icon_left="fa-unlock"
+                    bootstrapbutton:bb_type="info"/>
+        </LinearLayout>
+    </LinearLayout>
+</ScrollView>
\ No newline at end of file
diff --git a/OpenPGP-Keychain/src/main/res/layout/drawer_list.xml b/OpenPGP-Keychain/src/main/res/layout/drawer_list.xml
index 81ceba20c..ab00c0073 100644
--- a/OpenPGP-Keychain/src/main/res/layout/drawer_list.xml
+++ b/OpenPGP-Keychain/src/main/res/layout/drawer_list.xml
@@ -9,7 +9,7 @@
 -->
 <ListView xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/left_drawer"
-    android:layout_width="240dp"
+    android:layout_width="@dimen/drawer_size"
     android:layout_height="match_parent"
     android:layout_gravity="start"
     android:background="@color/white"
diff --git a/OpenPGP-Keychain/src/main/res/layout/encrypt_activity.xml b/OpenPGP-Keychain/src/main/res/layout/encrypt_activity.xml
index 4fe65e341..6484c9b7b 100644
--- a/OpenPGP-Keychain/src/main/res/layout/encrypt_activity.xml
+++ b/OpenPGP-Keychain/src/main/res/layout/encrypt_activity.xml
@@ -6,399 +6,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <ScrollView
-        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:orientation="vertical"
-            android:paddingLeft="10dp"
-            android:paddingRight="10dp">
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal"
-                android:padding="4dp">
-
-                <ImageView
-                    android:id="@+id/modePrevious"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:src="@drawable/ic_previous" />
-
-                <TextView
-                    android:id="@+id/modeLabel"
-                    style="@style/SectionHeader"
-                    android:layout_width="0dip"
-                    android:layout_height="match_parent"
-                    android:layout_weight="1"
-                    android:gravity="center_horizontal|center_vertical"
-                    android:text="@string/label_asymmetric" />
-
-                <ImageView
-                    android:id="@+id/modeNext"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:src="@drawable/ic_next" />
-            </LinearLayout>
-
-            <ViewFlipper
-                android:id="@+id/mode"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content">
-
-                <LinearLayout
-                    android:id="@+id/modeAsymmetric"
-                    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">
-
-                            <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>
-
-                <TableLayout
-                    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>
-            </ViewFlipper>
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal"
-                android:padding="4dp">
-
-                <ImageView
-                    android:id="@+id/sourcePrevious"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:src="@drawable/ic_previous" />
-
-                <TextView
-                    android:id="@+id/sourceLabel"
-                    style="@style/SectionHeader"
-                    android:layout_width="0dip"
-                    android:layout_height="match_parent"
-                    android:layout_weight="1"
-                    android:gravity="center_horizontal|center_vertical"
-                    android:text="@string/label_message"
-                    android:textAppearance="?android:attr/textAppearanceMedium" />
-
-                <ImageView
-                    android:id="@+id/sourceNext"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:src="@drawable/ic_next" />
-            </LinearLayout>
-
-            <ViewFlipper
-                android:id="@+id/source"
-                android:layout_width="match_parent"
-                android:layout_height="0dip"
-                android:layout_weight="1">
-
-                <LinearLayout
-                    android:id="@+id/sourceMessage"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:orientation="vertical"
-                    android:padding="4dp">
-
-                    <EditText
-                        android:id="@+id/message"
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent"
-                        android:gravity="top"
-                        android:inputType="text|textCapSentences|textMultiLine|textLongMessage" />
-                </LinearLayout>
-
-                <LinearLayout
-                    android:id="@+id/sourceFile"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:orientation="vertical"
-                    android:padding="4dp">
-
-                    <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>
-
-                    <LinearLayout
-                        android:id="@+id/advancedSettingsControl"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:orientation="horizontal"
-                        android:clickable="true">
-
-                        <com.beardedhen.androidbootstrap.FontAwesomeText
-                            android:id="@+id/advancedSettingsIcon"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_marginRight="10dp"
-                            android:textSize="12sp"
-                            android:paddingTop="@dimen/padding_medium"
-                            android:paddingBottom="@dimen/padding_medium"
-                            fontawesometext:fa_icon="fa-chevron-right" />
-
-                        <TextView
-                            android:id="@+id/advancedSettings"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:text="@string/btn_encryption_advanced_settings_show"
-                            android:paddingTop="@dimen/padding_medium"
-                            android:paddingBottom="@dimen/padding_medium"
-                            android:textColor="@color/emphasis" />
-                    </LinearLayout>
-
-                    <LinearLayout
-                        android:id="@+id/fileAdvancedSettingsContainer"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:orientation="vertical"
-                        android:visibility="gone">
-
-                        <LinearLayout
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:orientation="horizontal">
-
-                            <TextView
-                                android:id="@+id/label_fileCompression"
-                                android:layout_width="0dip"
-                                android:layout_height="wrap_content"
-                                android:layout_gravity="center_vertical"
-                                android:layout_weight="1"
-                                android:paddingRight="10dip"
-                                android:text="@string/label_file_compression"
-                                android:textAppearance="?android:attr/textAppearanceSmall" />
-
-                            <Spinner
-                                android:id="@+id/fileCompression"
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:layout_gravity="center_vertical" />
-                        </LinearLayout>
-
-                        <LinearLayout
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:orientation="horizontal">
-
-                            <CheckBox
-                                android:id="@+id/deleteAfterEncryption"
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:layout_gravity="center_vertical"
-                                android:text="@string/label_delete_after_encryption" />
-                        </LinearLayout>
-
-                        <LinearLayout
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:orientation="horizontal">
-
-                            <CheckBox
-                                android:id="@+id/shareAfterEncryption"
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:layout_gravity="center_vertical"
-                                android:text="@string/label_share_after_encryption" />
-                        </LinearLayout>
-
-                        <LinearLayout
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:orientation="horizontal">
-
-                            <CheckBox
-                                android:id="@+id/asciiArmour"
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:layout_gravity="center_vertical"
-                                android:text="@string/label_ascii_armor" />
-                        </LinearLayout>
-                    </LinearLayout>
-                </LinearLayout>
-            </ViewFlipper>
-
-            <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-lock"
-                    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-lock"
-                    bootstrapbutton:bb_type="info" />
-
-                <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" />
-            </LinearLayout>
-        </LinearLayout>
-    </ScrollView>
+    <include layout="@layout/encrypt_content"/>
 
     <include layout="@layout/drawer_list" />
 
diff --git a/OpenPGP-Keychain/src/main/res/layout/encrypt_content.xml b/OpenPGP-Keychain/src/main/res/layout/encrypt_content.xml
new file mode 100644
index 000000000..d6a05f0d4
--- /dev/null
+++ b/OpenPGP-Keychain/src/main/res/layout/encrypt_content.xml
@@ -0,0 +1,398 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ScrollView
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:fontawesometext="http://schemas.android.com/apk/res-auto"
+        xmlns:bootstrapbutton="http://schemas.android.com/apk/res-auto" android:id="@+id/content_frame"
+        android:layout_marginLeft="@dimen/drawer_content_padding"
+        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:orientation="vertical"
+            android:paddingLeft="10dp"
+            android:paddingRight="10dp">
+
+        <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal"
+                android:padding="4dp">
+
+            <ImageView
+                    android:id="@+id/modePrevious"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/ic_previous"/>
+
+            <TextView
+                    android:id="@+id/modeLabel"
+                    style="@style/SectionHeader"
+                    android:layout_width="0dip"
+                    android:layout_height="match_parent"
+                    android:layout_weight="1"
+                    android:gravity="center_horizontal|center_vertical"
+                    android:text="@string/label_asymmetric"/>
+
+            <ImageView
+                    android:id="@+id/modeNext"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/ic_next"/>
+        </LinearLayout>
+
+        <ViewFlipper
+                android:id="@+id/mode"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
+
+            <LinearLayout
+                    android:id="@+id/modeAsymmetric"
+                    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">
+
+                        <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>
+
+            <TableLayout
+                    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>
+        </ViewFlipper>
+
+        <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal"
+                android:padding="4dp">
+
+            <ImageView
+                    android:id="@+id/sourcePrevious"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/ic_previous"/>
+
+            <TextView
+                    android:id="@+id/sourceLabel"
+                    style="@style/SectionHeader"
+                    android:layout_width="0dip"
+                    android:layout_height="match_parent"
+                    android:layout_weight="1"
+                    android:gravity="center_horizontal|center_vertical"
+                    android:text="@string/label_message"
+                    android:textAppearance="?android:attr/textAppearanceMedium"/>
+
+            <ImageView
+                    android:id="@+id/sourceNext"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/ic_next"/>
+        </LinearLayout>
+
+        <ViewFlipper
+                android:id="@+id/source"
+                android:layout_width="match_parent"
+                android:layout_height="0dip"
+                android:layout_weight="1">
+
+            <LinearLayout
+                    android:id="@+id/sourceMessage"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:orientation="vertical"
+                    android:padding="4dp">
+
+                <EditText
+                        android:id="@+id/message"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:gravity="top"
+                        android:inputType="text|textCapSentences|textMultiLine|textLongMessage"/>
+            </LinearLayout>
+
+            <LinearLayout
+                    android:id="@+id/sourceFile"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:orientation="vertical"
+                    android:padding="4dp">
+
+                <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>
+
+                <LinearLayout
+                        android:id="@+id/advancedSettingsControl"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:orientation="horizontal"
+                        android:clickable="true">
+
+                    <com.beardedhen.androidbootstrap.FontAwesomeText
+                            android:id="@+id/advancedSettingsIcon"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginRight="10dp"
+                            android:textSize="12sp"
+                            android:paddingTop="@dimen/padding_medium"
+                            android:paddingBottom="@dimen/padding_medium"
+                            fontawesometext:fa_icon="fa-chevron-right"/>
+
+                    <TextView
+                            android:id="@+id/advancedSettings"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@string/btn_encryption_advanced_settings_show"
+                            android:paddingTop="@dimen/padding_medium"
+                            android:paddingBottom="@dimen/padding_medium"
+                            android:textColor="@color/emphasis"/>
+                </LinearLayout>
+
+                <LinearLayout
+                        android:id="@+id/fileAdvancedSettingsContainer"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:orientation="vertical"
+                        android:visibility="gone">
+
+                    <LinearLayout
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:orientation="horizontal">
+
+                        <TextView
+                                android:id="@+id/label_fileCompression"
+                                android:layout_width="0dip"
+                                android:layout_height="wrap_content"
+                                android:layout_gravity="center_vertical"
+                                android:layout_weight="1"
+                                android:paddingRight="10dip"
+                                android:text="@string/label_file_compression"
+                                android:textAppearance="?android:attr/textAppearanceSmall"/>
+
+                        <Spinner
+                                android:id="@+id/fileCompression"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_gravity="center_vertical"/>
+                    </LinearLayout>
+
+                    <LinearLayout
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:orientation="horizontal">
+
+                        <CheckBox
+                                android:id="@+id/deleteAfterEncryption"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_gravity="center_vertical"
+                                android:text="@string/label_delete_after_encryption"/>
+                    </LinearLayout>
+
+                    <LinearLayout
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:orientation="horizontal">
+
+                        <CheckBox
+                                android:id="@+id/shareAfterEncryption"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_gravity="center_vertical"
+                                android:text="@string/label_share_after_encryption"/>
+                    </LinearLayout>
+
+                    <LinearLayout
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:orientation="horizontal">
+
+                        <CheckBox
+                                android:id="@+id/asciiArmour"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_gravity="center_vertical"
+                                android:text="@string/label_ascii_armor"/>
+                    </LinearLayout>
+                </LinearLayout>
+            </LinearLayout>
+        </ViewFlipper>
+
+        <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-lock"
+                    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-lock"
+                    bootstrapbutton:bb_type="info"/>
+
+            <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"/>
+        </LinearLayout>
+    </LinearLayout>
+</ScrollView>
\ No newline at end of file
diff --git a/OpenPGP-Keychain/src/main/res/layout/import_keys_activity.xml b/OpenPGP-Keychain/src/main/res/layout/import_keys_activity.xml
index d7794ace3..b11f99757 100644
--- a/OpenPGP-Keychain/src/main/res/layout/import_keys_activity.xml
+++ b/OpenPGP-Keychain/src/main/res/layout/import_keys_activity.xml
@@ -5,58 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent" >
 
-    <RelativeLayout
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_centerHorizontal="true" >
-
-        <FrameLayout
-            android:id="@+id/import_navigation_fragment"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_alignParentTop="true"
-            android:orientation="vertical"
-            android:paddingLeft="4dp"
-            android:paddingRight="4dp" />
-
-        <LinearLayout
-            android:id="@+id/import_footer"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_alignParentBottom="true"
-            android:orientation="vertical"
-            android:paddingLeft="10dp"
-            android:paddingRight="10dp" >
-
-            <com.beardedhen.androidbootstrap.BootstrapButton
-                android:id="@+id/import_import"
-                android:layout_width="match_parent"
-                android:layout_height="60dp"
-                android:padding="4dp"
-                android:text="@string/import_import"
-                bootstrapbutton:bb_icon_left="fa-download"
-                bootstrapbutton:bb_type="info" />
-
-            <!-- <com.beardedhen.androidbootstrap.BootstrapButton -->
-            <!-- android:id="@+id/import_sign_and_upload" -->
-            <!-- android:layout_width="match_parent" -->
-            <!-- android:layout_height="60dp" -->
-            <!-- android:padding="4dp" -->
-            <!-- android:text="@string/import_sign_and_upload" -->
-            <!-- bootstrapbutton:bb_type="info" /> -->
-        </LinearLayout>
-
-        <FrameLayout
-            android:id="@+id/import_keys_list_container"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_above="@+id/import_footer"
-            android:layout_alignParentLeft="true"
-            android:layout_below="@+id/import_navigation_fragment"
-            android:orientation="vertical"
-            android:paddingLeft="4dp"
-            android:paddingRight="4dp" />
-    </RelativeLayout>
+    <include layout="@layout/import_keys_content"/>
 
     <include layout="@layout/drawer_list" />
 
diff --git a/OpenPGP-Keychain/src/main/res/layout/import_keys_content.xml b/OpenPGP-Keychain/src/main/res/layout/import_keys_content.xml
new file mode 100644
index 000000000..fae8147e5
--- /dev/null
+++ b/OpenPGP-Keychain/src/main/res/layout/import_keys_content.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:bootstrapbutton="http://schemas.android.com/apk/res-auto" android:id="@+id/content_frame"
+        android:layout_marginLeft="@dimen/drawer_content_padding"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerHorizontal="true">
+
+    <FrameLayout
+            android:id="@+id/import_navigation_fragment"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_alignParentTop="true"
+            android:orientation="vertical"
+            android:paddingLeft="4dp"
+            android:paddingRight="4dp"/>
+
+    <LinearLayout
+            android:id="@+id/import_footer"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_alignParentBottom="true"
+            android:orientation="vertical"
+            android:paddingLeft="10dp"
+            android:paddingRight="10dp">
+
+        <com.beardedhen.androidbootstrap.BootstrapButton
+                android:id="@+id/import_import"
+                android:layout_width="match_parent"
+                android:layout_height="60dp"
+                android:padding="4dp"
+                android:text="@string/import_import"
+                bootstrapbutton:bb_icon_left="fa-download"
+                bootstrapbutton:bb_type="info"/>
+
+        <!-- <com.beardedhen.androidbootstrap.BootstrapButton -->
+        <!-- android:id="@+id/import_sign_and_upload" -->
+        <!-- android:layout_width="match_parent" -->
+        <!-- android:layout_height="60dp" -->
+        <!-- android:padding="4dp" -->
+        <!-- android:text="@string/import_sign_and_upload" -->
+        <!-- bootstrapbutton:bb_type="info" /> -->
+    </LinearLayout>
+
+    <FrameLayout
+            android:id="@+id/import_keys_list_container"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_above="@+id/import_footer"
+            android:layout_alignParentLeft="true"
+            android:layout_below="@+id/import_navigation_fragment"
+            android:orientation="vertical"
+            android:paddingLeft="4dp"
+            android:paddingRight="4dp"/>
+</RelativeLayout>
\ No newline at end of file
diff --git a/OpenPGP-Keychain/src/main/res/layout/key_list_activity.xml b/OpenPGP-Keychain/src/main/res/layout/key_list_activity.xml
index 65d246d7b..fcb376fa8 100644
--- a/OpenPGP-Keychain/src/main/res/layout/key_list_activity.xml
+++ b/OpenPGP-Keychain/src/main/res/layout/key_list_activity.xml
@@ -4,16 +4,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent" >
 
-    <FrameLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent" >
-
-        <fragment
-            android:id="@+id/key_list_fragment"
-            android:name="org.sufficientlysecure.keychain.ui.KeyListFragment"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent" />
-    </FrameLayout>
+    <include layout="@layout/key_list_content"/>
 
     <include layout="@layout/drawer_list" />
 
diff --git a/OpenPGP-Keychain/src/main/res/layout/key_list_content.xml b/OpenPGP-Keychain/src/main/res/layout/key_list_content.xml
new file mode 100644
index 000000000..e58e42961
--- /dev/null
+++ b/OpenPGP-Keychain/src/main/res/layout/key_list_content.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout
+        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">
+
+    <fragment
+            android:id="@+id/key_list_fragment"
+            android:name="org.sufficientlysecure.keychain.ui.KeyListFragment"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"/>
+</FrameLayout>
\ No newline at end of file
diff --git a/OpenPGP-Keychain/src/main/res/values-large/dimens.xml b/OpenPGP-Keychain/src/main/res/values-large/dimens.xml
new file mode 100644
index 000000000..192a4bb99
--- /dev/null
+++ b/OpenPGP-Keychain/src/main/res/values-large/dimens.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="drawer_content_padding">240dp</dimen>
+</resources>
diff --git a/OpenPGP-Keychain/src/main/res/values/dimens.xml b/OpenPGP-Keychain/src/main/res/values/dimens.xml
new file mode 100644
index 000000000..e1a7749f0
--- /dev/null
+++ b/OpenPGP-Keychain/src/main/res/values/dimens.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="drawer_size">240dp</dimen>
+    <dimen name="drawer_content_padding">0dp</dimen>
+</resources>
\ No newline at end of file