diff --git a/OpenKeychain/src/main/res/layout/encrypt_symmetric_fragment.xml b/OpenKeychain/src/main/res/layout/encrypt_symmetric_fragment.xml
index 699f991a7..c77eea985 100644
--- a/OpenKeychain/src/main/res/layout/encrypt_symmetric_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/encrypt_symmetric_fragment.xml
@@ -1,46 +1,31 @@
 <?xml version="1.0" encoding="utf-8"?>
-<TableLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/modeSymmetric"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:stretchColumns="1"
-    android:paddingTop="4dp"
-    android:paddingBottom="4dp"
     android:paddingLeft="16dp"
     android:paddingRight="16dp"
-    android:layout_centerVertical="true">
+    android:orientation="vertical">
 
-    <TableRow>
+    <EditText
+        android:id="@+id/passphrase"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="8dp"
+        android:layout_marginBottom="8dp"
+        android:imeOptions="actionNext"
+        android:inputType="textPassword"
+        android:hint="@string/label_passphrase"
+        android:ems="10"
+        android:layout_gravity="center_horizontal" />
 
-        <TextView
-            android:id="@+id/label_passphrase"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:paddingRight="8dp"
-            android:text="@string/label_passphrase"
-            android:textAppearance="?android:attr/textAppearanceMedium" />
+    <EditText
+        android:id="@+id/passphraseAgain"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="8dp"
+        android:inputType="textPassword"
+        android:hint="@string/label_passphrase_again"
+        android:ems="10"
+        android:layout_gravity="center_horizontal" />
 
-        <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:paddingRight="8dp"
-            android:text="@string/label_passphrase_again"
-            android:textAppearance="?android:attr/textAppearanceMedium" />
-
-        <EditText
-            android:id="@+id/passphraseAgain"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:inputType="textPassword" />
-    </TableRow>
-</TableLayout>
\ No newline at end of file
+</LinearLayout>
\ No newline at end of file