diff --git a/res/layout/fragment_conversation.xml b/res/layout/fragment_conversation.xml
index 703a525e9..c09a7d5f3 100644
--- a/res/layout/fragment_conversation.xml
+++ b/res/layout/fragment_conversation.xml
@@ -76,7 +76,7 @@
                 android:id="@+id/muc_error_msg"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:padding="8dp"
+                android:padding="6dp"
                 android:textColor="#eee"
                 android:textSize="20sp"
                 android:textStyle="bold" />
@@ -84,9 +84,9 @@
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:paddingBottom="8dp"
-                android:paddingLeft="8dp"
-                android:text="Click to edit conference details"
+                android:paddingBottom="6dp"
+                android:paddingLeft="6dp"
+                android:text="@string/edit_conference_details"
                 android:textColor="#eee"
                 android:textSize="14sp" />
         </LinearLayout>
@@ -102,8 +102,8 @@
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:padding="8dp"
-                android:text="Unknown OTR Fingerprint"
+                android:padding="6dp"
+                android:text="@string/unknown_otr_fingerprint"
                 android:textColor="#eee"
                 android:textSize="20sp"
                 android:textStyle="bold" />
@@ -112,10 +112,11 @@
                 android:id="@+id/otr_fingerprint"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:paddingBottom="8dp"
-                android:paddingLeft="8dp"
+                android:paddingBottom="6dp"
+                android:paddingLeft="6dp"
                 android:textColor="#eee"
                 android:textSize="14sp"
+                android:singleLine="true"
                 android:typeface="monospace" />
         </LinearLayout>
 
@@ -130,8 +131,8 @@
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:padding="8dp"
-                android:text="OpenPGP encrypted messages found"
+                android:padding="6dp"
+                android:text="@string/openpgp_messages_found"
                 android:textColor="#eee"
                 android:textSize="20sp"
                 android:textStyle="bold" />
@@ -139,9 +140,9 @@
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:paddingBottom="8dp"
-                android:paddingLeft="8dp"
-                android:text="Click here to enter passphrase and decrypt messages"
+                android:paddingBottom="6dp"
+                android:paddingLeft="6dp"
+                android:text="@string/openpgp_click_to_decrypt"
                 android:textColor="#eee"
                 android:textSize="14sp" />
         </LinearLayout>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 021c70e87..40715a066 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -244,4 +244,8 @@
     <string name="last_seen_days">last seen %d days ago</string>
     <string name="never_seen">never seen</string>
     <string name="install_openkeychain">Encrypted message. Please install OpenKeychain to decrypt.</string>
+    <string name="unknown_otr_fingerprint">Unknown OTR fingerprint</string>
+    <string name="edit_conference_details">Touch to edit conference details</string>
+    <string name="openpgp_messages_found">OpenPGP encrypted messages found</string>
+    <string name="openpgp_click_to_decrypt">Click here to enter passphrase and decrypt messages</string>
 </resources>
\ No newline at end of file