1 files changed, 39 insertions, 11 deletions
diff --git a/res/layout/activity_edit_account.xml b/res/layout/activity_edit_account.xml
index e4d9665a..3cab4b80 100644
--- a/res/layout/activity_edit_account.xml
+++ b/res/layout/activity_edit_account.xml
@@ -4,6 +4,16 @@
     android:layout_height="match_parent"
     android:background="@color/primarybackground" >
 
+    <ScrollView
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:layout_above="@+id/button_bar"
+        android:layout_alignParentTop="true">
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content" 
+            android:orientation="vertical">
+
     <LinearLayout
         android:id="@+id/editor"
         android:layout_width="fill_parent"
@@ -72,28 +82,25 @@
         android:id="@+id/stats"
         android:layout_width="fill_parent"
         android:layout_height="fill_parent"
-        android:layout_above="@+id/button_bar"
-        android:layout_alignParentLeft="true"
-        android:layout_below="@+id/editor"
         android:layout_marginTop="8dp"
         android:orientation="vertical"
         android:padding="16dp"
-        android:visibility="gone">
+        android:visibility="gone" >
 
         <TextView
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
-            android:textSize="18sp"
-            android:textStyle="bold"
-            android:textColor="@color/secondarytext"
+            android:gravity="center_horizontal"
             android:text="@string/additional_information"
-            android:gravity="center_horizontal"/>
+            android:textColor="@color/secondarytext"
+            android:textSize="18sp"
+            android:textStyle="bold" />
 
         <TableLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:stretchColumns="1"
-            android:layout_marginTop="8dp">
+            android:layout_marginTop="8dp"
+            android:stretchColumns="1" >
 
             <TableRow
                 android:layout_width="fill_parent"
@@ -127,7 +134,28 @@
                     android:layout_gravity="right" />
             </TableRow>
         </TableLayout>
+
+        <TextView
+            android:id="@+id/otr_fingerprint_headline"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="16dp"
+            android:gravity="center_horizontal"
+            android:text="@string/otr_fingerprint"
+            android:textColor="@color/secondarytext"
+            android:textSize="18sp"
+            android:textStyle="bold" />
+
+        <TextView
+            android:id="@+id/otr_fingerprint"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="8dp"
+            android:textSize="14sp"
+            android:typeface="monospace" />
+    </LinearLayout>
     </LinearLayout>
+    </ScrollView>
 
     <LinearLayout
         android:id="@+id/button_bar"
@@ -135,7 +163,7 @@
         android:layout_height="wrap_content"
         android:layout_alignParentBottom="true"
         android:layout_alignParentLeft="true"
-        android:layout_alignParentRight="true">
+        android:layout_alignParentRight="true" >
 
         <Button
             android:id="@+id/cancel_button"