diff --git a/OpenPGP-Keychain/src/main/res/layout/decrypt_activity.xml b/OpenPGP-Keychain/src/main/res/layout/decrypt_activity.xml
index a974f6ec0..25c7c000c 100644
--- a/OpenPGP-Keychain/src/main/res/layout/decrypt_activity.xml
+++ b/OpenPGP-Keychain/src/main/res/layout/decrypt_activity.xml
@@ -5,201 +5,206 @@
     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">
+    <ScrollView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:fillViewport="true"
+        android:orientation="vertical">
 
-            <LinearLayout
+        <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:orientation="vertical"
-                android:paddingTop="4dp"
+                android:clickable="true"
+                android:orientation="horizontal"
+                android:padding="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:inputType="textNoSuggestions" />
-
-                            <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" />
+                    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="wrap_content"
-                    android:orientation="horizontal"
+                    android:layout_height="match_parent"
+                    android:orientation="vertical"
                     android:padding="4dp">
 
-                    <com.beardedhen.androidbootstrap.BootstrapButton
-                        android:id="@+id/action_decrypt"
+                    <EditText
+                        android:id="@+id/message"
                         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" />
+                        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>
-        </ScrollView>
+        </LinearLayout>
+    </ScrollView>
 
     <include layout="@layout/drawer_list" />
 
diff --git a/OpenPGP-Keychain/src/main/res/layout/encrypt_activity.xml b/OpenPGP-Keychain/src/main/res/layout/encrypt_activity.xml
index dc4cf0063..4fe65e341 100644
--- a/OpenPGP-Keychain/src/main/res/layout/encrypt_activity.xml
+++ b/OpenPGP-Keychain/src/main/res/layout/encrypt_activity.xml
@@ -238,7 +238,12 @@
                             android:layout_width="0dip"
                             android:layout_height="wrap_content"
                             android:layout_weight="1"
-                            android:inputType="textNoSuggestions" />
+                            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"
@@ -257,6 +262,7 @@
                         android:layout_height="wrap_content"
                         android:orientation="horizontal"
                         android:clickable="true">
+
                         <com.beardedhen.androidbootstrap.FontAwesomeText
                             android:id="@+id/advancedSettingsIcon"
                             android:layout_width="wrap_content"
@@ -265,7 +271,8 @@
                             android:textSize="12sp"
                             android:paddingTop="@dimen/padding_medium"
                             android:paddingBottom="@dimen/padding_medium"
-                            fontawesometext:fa_icon="fa-chevron-right"/>
+                            fontawesometext:fa_icon="fa-chevron-right" />
+
                         <TextView
                             android:id="@+id/advancedSettings"
                             android:layout_width="wrap_content"
@@ -273,7 +280,7 @@
                             android:text="@string/btn_encryption_advanced_settings_show"
                             android:paddingTop="@dimen/padding_medium"
                             android:paddingBottom="@dimen/padding_medium"
-                            android:textColor="@color/emphasis"/>
+                            android:textColor="@color/emphasis" />
                     </LinearLayout>
 
                     <LinearLayout
diff --git a/OpenPGP-Keychain/src/main/res/layout/file_dialog.xml b/OpenPGP-Keychain/src/main/res/layout/file_dialog.xml
index a2939f571..83d697001 100644
--- a/OpenPGP-Keychain/src/main/res/layout/file_dialog.xml
+++ b/OpenPGP-Keychain/src/main/res/layout/file_dialog.xml
@@ -26,8 +26,8 @@
             android:layout_weight="1"
             android:gravity="top|left"
             android:inputType="textMultiLine|textUri"
-            android:lines="2"
-            android:maxLines="6"
+            android:lines="4"
+            android:maxLines="10"
             android:minLines="2"
             android:scrollbars="vertical" />