copy commits

6 files changed, 497 insertions, 462 deletions

diff --git a/src/main/res/layout/activity_edit_account.xml b/src/main/res/layout/activity_edit_account.xml
index 8ffb79767..c38881e41 100644
--- a/src/main/res/layout/activity_edit_account.xml
+++ b/src/main/res/layout/activity_edit_account.xml
@@ -12,475 +12,501 @@
         android:layout_above="@+id/button_bar"
         android:layout_alignParentTop="true" >
 
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical" >
+
+        <RelativeLayout
+            android:id="@+id/editor"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="@dimen/activity_horizontal_margin"
+            android:layout_marginRight="@dimen/activity_horizontal_margin"
+            android:layout_marginTop="@dimen/activity_vertical_margin"
+            android:layout_marginBottom="@dimen/activity_vertical_margin"
+            android:background="@drawable/infocard_border"
+            android:orientation="vertical"
+            android:padding="@dimen/infocard_padding">
+
+        <com.makeramen.roundedimageview.RoundedImageView
+            android:id="@+id/avater"
+            android:layout_width="300dp"
+            android:layout_height="300dp"
+            android:layout_alignParentTop="true"
+            android:layout_marginRight="16dp"
+            android:layout_centerHorizontal="true"
+            android:contentDescription="@string/account_image_description"
+            app:riv_corner_radius="2dp"/>
+
         <LinearLayout
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:layout_toRightOf="@+id/avater">
+        <TextView
+            android:id="@+id/account_jid_label"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/account_settings_jabber_id"
+            android:textColor="@color/black87"
+            android:textSize="?attr/TextSizeBody" />
+
+        <AutoCompleteTextView
+            android:id="@+id/account_jid"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:orientation="vertical" >
-
-            <RelativeLayout
-                android:id="@+id/editor"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="@dimen/activity_horizontal_margin"
-                android:layout_marginRight="@dimen/activity_horizontal_margin"
-                android:layout_marginTop="@dimen/activity_vertical_margin"
-                android:layout_marginBottom="@dimen/activity_vertical_margin"
-                android:background="@drawable/infocard_border"
-                android:orientation="vertical"
-                android:padding="@dimen/infocard_padding">
-
-                <com.makeramen.roundedimageview.RoundedImageView
-                    android:id="@+id/avater"
-                    android:layout_width="300dp"
-                    android:layout_height="300dp"
-                    android:layout_alignParentTop="true"
-                    android:layout_marginRight="16dp"
-                    android:layout_centerHorizontal="true"
-                    android:contentDescription="@string/account_image_description"
-                    app:riv_corner_radius="2dp"/>
-
-                <LinearLayout
-                    android:layout_width="fill_parent"
-                    android:layout_height="wrap_content"
-                    android:orientation="vertical"
-                    android:layout_below="@+id/avater"
-                    android:layout_alignParentLeft="true"
-                    android:layout_alignParentStart="true"
-                    android:layout_marginTop="16dp">
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="@string/account_settings_jabber_id"
-                        android:textColor="@color/black87"
-                        android:textSize="?attr/TextSizeBody" />
-
-                    <AutoCompleteTextView
-                        android:id="@+id/account_jid"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:hint="@string/account_settings_example_jabber_id"
-                        android:inputType="textEmailAddress"
-                        android:textColor="@color/black87"
-                        android:textColorHint="@color/black54"
-                        android:textSize="?attr/TextSizeBody" />
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="8dp"
-                        android:text="@string/account_settings_password"
-                        android:textColor="@color/black87"
-                        android:textSize="?attr/TextSizeBody" />
-
-                    <EditText
-                        android:id="@+id/account_password"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:hint="@string/password"
-                        android:inputType="textPassword"
-                        android:textColor="@color/black87"
-                        android:textColorHint="@color/black54"
-                        android:textSize="?attr/TextSizeBody" />
-
-                    <CheckBox
-                        android:id="@+id/account_register_new"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="8dp"
-                        android:text="@string/register_account"
-                        android:textColor="@color/black87"
-                        android:textSize="?attr/TextSizeBody" />
-
-                    <TextView
-                        android:id="@+id/account_confirm_password_desc"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="@string/account_settings_confirm_password"
-                        android:textColor="@color/black87"
-                        android:textSize="?attr/TextSizeBody"
-                        android:visibility="gone" />
-
-                    <EditText
-                        android:id="@+id/account_password_confirm"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="8dp"
-                        android:hint="@string/confirm_password"
-                        android:inputType="textPassword"
-                        android:visibility="gone"
-                        android:textColor="@color/black87"
-                        android:textColorHint="@color/black54"
-                        android:textSize="?attr/TextSizeBody" />
-                </LinearLayout>
-            </RelativeLayout>
-
-            <LinearLayout
-                android:id="@+id/stats"
-                android:layout_width="fill_parent"
-                android:layout_height="fill_parent"
-                android:layout_marginLeft="@dimen/activity_horizontal_margin"
-                android:layout_marginRight="@dimen/activity_horizontal_margin"
-                android:layout_marginTop="@dimen/activity_vertical_margin"
-                android:layout_marginBottom="@dimen/activity_vertical_margin"
-                android:background="@drawable/infocard_border"
-                android:orientation="vertical"
-                android:padding="@dimen/infocard_padding"
-                android:visibility="gone" >
-
-                <TableLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:stretchColumns="1" >
-
-                    <TableRow
-                        android:layout_width="fill_parent"
-                        android:layout_height="wrap_content"
-                        tools:ignore="UselessParent">
-
-                        <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:text="@string/server_info_session_established"
-                            android:textColor="@color/black87"
-                            android:textSize="?attr/TextSizeBody" />
-
-                        <TextView
-                            android:id="@+id/session_est"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_gravity="right"
-                            android:textColor="@color/black87"
-                            android:textSize="?attr/TextSizeBody"
-                            tools:ignore="RtlHardcoded"/>
-                    </TableRow>
-
-                </TableLayout>
-                <TableLayout
-                    android:id="@+id/server_info_more"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:stretchColumns="1"
-                    android:visibility="gone" >
-
-                    <TableRow
-                        android:layout_width="fill_parent"
-                        android:layout_height="wrap_content" >
-
-                        <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:text="@string/server_info_pep"
-                            android:textColor="@color/black87"
-                            android:textSize="?attr/TextSizeBody" />
-
-                        <TextView
-                            android:id="@+id/server_info_pep"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_gravity="right"
-                            android:textColor="@color/black87"
-                            android:textSize="?attr/TextSizeBody"
-                            tools:ignore="RtlHardcoded"/>
-                    </TableRow>
-
-                    <TableRow
-                        android:layout_width="fill_parent"
-                        android:layout_height="wrap_content" >
-
-                        <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:text="@string/server_info_blocking"
-                            android:textColor="@color/black87"
-                            android:textSize="?attr/TextSizeBody" />
-
-                        <TextView
-                            android:id="@+id/server_info_blocking"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_gravity="right"
-                            android:textColor="@color/black87"
-                            android:textSize="?attr/TextSizeBody"
-                            tools:ignore="RtlHardcoded"/>
-                    </TableRow>
-
-                    <TableRow
-                        android:layout_width="fill_parent"
-                        android:layout_height="wrap_content" >
-
-                        <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:text="@string/server_info_stream_management"
-                            android:textColor="@color/black87"
-                            android:textSize="?attr/TextSizeBody" />
-
-                        <TextView
-                            android:id="@+id/server_info_sm"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_gravity="right"
-                            android:textColor="@color/black87"
-                            android:textSize="?attr/TextSizeBody"
-                            tools:ignore="RtlHardcoded"/>
-                    </TableRow>
-
-                    <TableRow
-                        android:layout_width="fill_parent"
-                        android:layout_height="wrap_content" >
-
-                        <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:text="@string/server_info_roster_version"
-                            android:textColor="@color/black87"
-                            android:textSize="?attr/TextSizeBody" />
-
-                        <TextView
-                            android:id="@+id/server_info_roster_version"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_gravity="right"
-                            android:textColor="@color/black87"
-                            android:textSize="?attr/TextSizeBody"
-                            tools:ignore="RtlHardcoded"/>
-                    </TableRow>
-
-                    <TableRow
-                        android:layout_width="fill_parent"
-                        android:layout_height="wrap_content" >
-
-                        <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:text="@string/server_info_carbon_messages"
-                            android:textColor="@color/black87"
-                            android:textSize="?attr/TextSizeBody" />
-
-                        <TextView
-                            android:id="@+id/server_info_carbons"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_gravity="right"
-                            android:textColor="@color/black87"
-                            android:textSize="?attr/TextSizeBody"
-                            tools:ignore="RtlHardcoded"/>
-                    </TableRow>
-
-                    <TableRow
-                        android:layout_width="fill_parent"
-                        android:layout_height="wrap_content" >
-
-                        <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:text="@string/server_info_mam"
-                            android:textColor="@color/black87"
-                            android:textSize="?attr/TextSizeBody" />
-
-                        <TextView
-                            android:id="@+id/server_info_mam"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_gravity="right"
-                            android:textColor="@color/black87"
-                            android:textSize="?attr/TextSizeBody"
-                            tools:ignore="RtlHardcoded"/>
-                    </TableRow>
-
-                    <TableRow
-                        android:layout_width="fill_parent"
-                        android:layout_height="wrap_content" >
-
-                        <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:text="@string/server_info_csi"
-                            android:textColor="@color/black87"
-                            android:textSize="?attr/TextSizeBody" />
-
-                        <TextView
-                            android:id="@+id/server_info_csi"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_gravity="right"
-                            android:textColor="@color/black87"
-                            android:textSize="?attr/TextSizeBody"
-                            tools:ignore="RtlHardcoded"/>
-                    </TableRow>
-                </TableLayout>
-
-                <RelativeLayout
-                    android:layout_width="wrap_content"
-                    android:layout_height="match_parent"
-                    android:id="@+id/otr_fingerprint_box"
-                    android:layout_marginTop="32dp">
-
-                    <LinearLayout
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_alignParentLeft="true"
-                        android:layout_toLeftOf="@+id/action_copy_to_clipboard"
-                        android:orientation="vertical">
-
-                        <TextView
-                            android:id="@+id/otr_fingerprint"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:textColor="@color/black87"
-                            android:textSize="?attr/TextSizeBody"
-                            android:typeface="monospace"
-                            android:fontFamily="monospace"/>
-
-                        <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:textColor="@color/black54"
-                            android:textSize="?attr/TextSizeInfo"
-                            android:text="@string/otr_fingerprint"/>
-                    </LinearLayout>
-
-                    <ImageButton
-                        android:id="@+id/action_copy_to_clipboard"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_alignParentRight="true"
-                        android:layout_centerVertical="true"
-                        android:background="?android:selectableItemBackground"
-                        android:padding="@dimen/image_button_padding"
-                        android:src="?attr/icon_copy"
-                        android:visibility="visible"
-                        android:contentDescription="@string/copy_otr_clipboard_description"/>
-                </RelativeLayout>
-                <RelativeLayout
-                    android:layout_width="wrap_content"
-                    android:layout_height="match_parent"
-                    android:id="@+id/axolotl_fingerprint_box"
-                    android:layout_marginTop="32dp">
-
-                    <LinearLayout
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_alignParentLeft="true"
-                        android:layout_toLeftOf="@+id/axolotl_actions"
-                        android:orientation="vertical">
-
-                        <TextView
-                            android:id="@+id/axolotl_fingerprint"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:textColor="@color/black87"
-                            android:textSize="?attr/TextSizeBody"
-                            android:typeface="monospace"
-                            android:fontFamily="monospace"/>
-
-                        <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:textColor="@color/black54"
-                            android:textSize="?attr/TextSizeInfo"
-                            android:text="@string/this_device_axolotl_fingerprint"/>
-                    </LinearLayout>
-
-                    <LinearLayout
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:id="@+id/axolotl_actions"
-                        android:layout_centerVertical="true"
-                        android:layout_alignParentRight="true"
-                        android:orientation="vertical">
-
-                        <ImageButton
-                            android:id="@+id/action_copy_axolotl_to_clipboard"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:background="?android:selectableItemBackground"
-                            android:padding="@dimen/image_button_padding"
-                            android:src="?attr/icon_copy"
-                            android:visibility="visible"
-                            android:contentDescription="@string/copy_axolotl_clipboard_description"/>
-                        <ImageButton
-                            android:id="@+id/action_regenerate_axolotl_key"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:background="?android:selectableItemBackground"
-                            android:padding="@dimen/image_button_padding"
-                            android:src="?attr/icon_refresh"
-                            android:visibility="gone"
-                            android:contentDescription="@string/regenerate_axolotl_key"/>
-
-                    </LinearLayout>
-                </RelativeLayout>
-            </LinearLayout>
-            <LinearLayout
-                android:id="@+id/other_device_keys_card"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="@dimen/activity_horizontal_margin"
-                android:layout_marginRight="@dimen/activity_horizontal_margin"
-                android:layout_marginTop="@dimen/activity_vertical_margin"
-                android:layout_marginBottom="@dimen/activity_vertical_margin"
-                android:background="@drawable/infocard_border"
-                android:orientation="vertical"
-                android:padding="@dimen/infocard_padding"
-                android:visibility="gone">
-
-                <TextView
-                    android:id="@+id/other_device_keys_title"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:textColor="@color/black87"
-                    android:textSize="?attr/TextSizeHeadline"
-                    android:textStyle="bold"
-                    android:text="@string/other_devices"/>
-
-                <LinearLayout
-                    android:id="@+id/other_device_keys"
-                    android:layout_width="fill_parent"
-                    android:layout_height="wrap_content"
-                    android:divider="?android:dividerHorizontal"
-                    android:orientation="vertical"
-                    android:showDividers="middle" >
-                </LinearLayout>
-            </LinearLayout>
-        </LinearLayout>
-    </ScrollView>
+            android:hint="@string/account_settings_example_jabber_id"
+            android:inputType="textEmailAddress"
+            android:textColor="@color/black87"
+            android:textColorHint="@color/black54"
+            android:textSize="?attr/TextSizeBody" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="8dp"
+            android:text="@string/account_settings_password"
+            android:textColor="@color/black87"
+            android:textSize="?attr/TextSizeBody" />
+
+        <EditText
+            android:id="@+id/account_password"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:hint="@string/password"
+            android:inputType="textPassword"
+            android:textColor="@color/black87"
+            android:textColorHint="@color/black54"
+            android:textSize="?attr/TextSizeBody" />
+
+        <AutoCompleteTextView
+            android:id="@+id/account_jid"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:hint="@string/account_settings_example_jabber_id"
+            android:inputType="textEmailAddress"
+            android:textColor="@color/black87"
+            android:textColorHint="@color/black54"
+            android:textSize="?attr/TextSizeBody" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="8dp"
+            android:text="@string/account_settings_password"
+            android:textColor="@color/black87"
+            android:textSize="?attr/TextSizeBody" />
+
+        <EditText
+            android:id="@+id/account_password"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:hint="@string/password"
+            android:inputType="textPassword"
+            android:textColor="@color/black87"
+            android:textColorHint="@color/black54"
+            android:textSize="?attr/TextSizeBody" />
+
+        <CheckBox
+            android:id="@+id/account_register_new"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="8dp"
+            android:text="@string/register_account"
+            android:textColor="@color/black87"
+            android:textSize="?attr/TextSizeBody" />
+
+        <TextView
+            android:id="@+id/account_confirm_password_desc"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/account_settings_confirm_password"
+            android:textColor="@color/black87"
+            android:textSize="?attr/TextSizeBody"
+            android:visibility="gone" />
+
+        <EditText
+            android:id="@+id/account_password_confirm"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="8dp"
+            android:hint="@string/confirm_password"
+            android:inputType="textPassword"
+            android:visibility="gone"
+            android:textColor="@color/black87"
+            android:textColorHint="@color/black54"
+            android:textSize="?attr/TextSizeBody" />
+    </LinearLayout>
+</RelativeLayout>
+
+<LinearLayout
+android:id="@+id/stats"
+android:layout_width="fill_parent"
+android:layout_height="fill_parent"
+android:layout_marginLeft="@dimen/activity_horizontal_margin"
+android:layout_marginRight="@dimen/activity_horizontal_margin"
+android:layout_marginTop="@dimen/activity_vertical_margin"
+android:layout_marginBottom="@dimen/activity_vertical_margin"
+android:background="@drawable/infocard_border"
+android:orientation="vertical"
+android:padding="@dimen/infocard_padding"
+android:visibility="gone" >
+
+<TableLayout
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:stretchColumns="1" >
+
+    <TableRow
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        tools:ignore="UselessParent">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/server_info_session_established"
+            android:textColor="@color/black87"
+            android:textSize="?attr/TextSizeBody" />
+
+        <TextView
+            android:id="@+id/session_est"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="right"
+            android:textColor="@color/black87"
+            android:textSize="?attr/TextSizeBody"
+            tools:ignore="RtlHardcoded"/>
+    </TableRow>
+
+</TableLayout>
+<TableLayout
+    android:id="@+id/server_info_more"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:stretchColumns="1"
+    android:visibility="gone" >
+
+    <TableRow
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content" >
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/server_info_pep"
+            android:textColor="@color/black87"
+            android:textSize="?attr/TextSizeBody" />
+
+        <TextView
+            android:id="@+id/server_info_pep"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="right"
+            android:textColor="@color/black87"
+            android:textSize="?attr/TextSizeBody"
+            tools:ignore="RtlHardcoded"/>
+    </TableRow>
+
+    <TableRow
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content" >
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/server_info_blocking"
+            android:textColor="@color/black87"
+            android:textSize="?attr/TextSizeBody" />
+
+        <TextView
+            android:id="@+id/server_info_blocking"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="right"
+            android:textColor="@color/black87"
+            android:textSize="?attr/TextSizeBody"
+            tools:ignore="RtlHardcoded"/>
+    </TableRow>
+
+    <TableRow
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content" >
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/server_info_stream_management"
+            android:textColor="@color/black87"
+            android:textSize="?attr/TextSizeBody" />
+
+        <TextView
+            android:id="@+id/server_info_sm"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="right"
+            android:textColor="@color/black87"
+            android:textSize="?attr/TextSizeBody"
+            tools:ignore="RtlHardcoded"/>
+    </TableRow>
+
+    <TableRow
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content" >
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/server_info_roster_version"
+            android:textColor="@color/black87"
+            android:textSize="?attr/TextSizeBody" />
+
+        <TextView
+            android:id="@+id/server_info_roster_version"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="right"
+            android:textColor="@color/black87"
+            android:textSize="?attr/TextSizeBody"
+            tools:ignore="RtlHardcoded"/>
+    </TableRow>
+
+    <TableRow
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content" >
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/server_info_carbon_messages"
+            android:textColor="@color/black87"
+            android:textSize="?attr/TextSizeBody" />
+
+        <TextView
+            android:id="@+id/server_info_carbons"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="right"
+            android:textColor="@color/black87"
+            android:textSize="?attr/TextSizeBody"
+            tools:ignore="RtlHardcoded"/>
+    </TableRow>
+
+    <TableRow
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content" >
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/server_info_mam"
+            android:textColor="@color/black87"
+            android:textSize="?attr/TextSizeBody" />
+
+        <TextView
+            android:id="@+id/server_info_mam"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="right"
+            android:textColor="@color/black87"
+            android:textSize="?attr/TextSizeBody"
+            tools:ignore="RtlHardcoded"/>
+    </TableRow>
+
+    <TableRow
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content" >
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/server_info_csi"
+            android:textColor="@color/black87"
+            android:textSize="?attr/TextSizeBody" />
+
+        <TextView
+            android:id="@+id/server_info_csi"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="right"
+            android:textColor="@color/black87"
+            android:textSize="?attr/TextSizeBody"
+            tools:ignore="RtlHardcoded"/>
+    </TableRow>
+</TableLayout>
+
+<RelativeLayout
+    android:layout_width="wrap_content"
+    android:layout_height="match_parent"
+    android:id="@+id/otr_fingerprint_box"
+    android:layout_marginTop="32dp">
+
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentLeft="true"
+        android:layout_toLeftOf="@+id/action_copy_to_clipboard"
+        android:orientation="vertical">
+
+        <TextView
+            android:id="@+id/otr_fingerprint"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textColor="@color/black87"
+            android:textSize="?attr/TextSizeBody"
+            android:typeface="monospace"
+            android:fontFamily="monospace"/>
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textColor="@color/black54"
+            android:textSize="?attr/TextSizeInfo"
+            android:text="@string/otr_fingerprint"/>
+    </LinearLayout>
+
+    <ImageButton
+        android:id="@+id/action_copy_to_clipboard"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentRight="true"
+        android:layout_centerVertical="true"
+        android:background="?android:selectableItemBackground"
+        android:padding="@dimen/image_button_padding"
+        android:src="?attr/icon_copy"
+        android:visibility="visible"
+        android:contentDescription="@string/copy_otr_clipboard_description"/>
+</RelativeLayout>
+<RelativeLayout
+    android:layout_width="wrap_content"
+    android:layout_height="match_parent"
+    android:id="@+id/axolotl_fingerprint_box"
+    android:layout_marginTop="32dp">
 
     <LinearLayout
-        android:id="@+id/button_bar"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true"
-        android:layout_alignParentStart="true"
-        android:layout_alignParentEnd="true"
         android:layout_alignParentLeft="true"
-        android:layout_alignParentRight="true" >
-
-        <Button
-            android:id="@+id/cancel_button"
-            style="?android:attr/borderlessButtonStyle"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:text="@string/cancel"
-            android:textColor="@color/black87" />
-
-        <View
-            android:layout_width="1dp"
-            android:layout_height="fill_parent"
-            android:layout_marginBottom="7dp"
-            android:layout_marginTop="7dp"
-            android:background="@color/black12" />
-
-        <Button
-            android:id="@+id/save_button"
-            style="?android:attr/borderlessButtonStyle"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:enabled="false"
-            android:text="@string/save"
-            android:textColor="@color/black54" />
+        android:layout_toLeftOf="@+id/axolotl_actions"
+        android:orientation="vertical">
+
+        <TextView
+            android:id="@+id/axolotl_fingerprint"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textColor="@color/black87"
+            android:textSize="?attr/TextSizeBody"
+            android:typeface="monospace"
+            android:fontFamily="monospace"/>
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textColor="@color/black54"
+            android:textSize="?attr/TextSizeInfo"
+            android:text="@string/this_device_axolotl_fingerprint"/>
     </LinearLayout>
 
-</RelativeLayout>
\ No newline at end of file
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:id="@+id/axolotl_actions"
+        android:layout_centerVertical="true"
+        android:layout_alignParentRight="true"
+        android:orientation="vertical">
+
+        <ImageButton
+            android:id="@+id/action_copy_axolotl_to_clipboard"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:background="?android:selectableItemBackground"
+            android:padding="@dimen/image_button_padding"
+            android:src="?attr/icon_copy"
+            android:visibility="visible"
+            android:contentDescription="@string/copy_axolotl_clipboard_description"/>
+        <ImageButton
+            android:id="@+id/action_regenerate_axolotl_key"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:background="?android:selectableItemBackground"
+            android:padding="@dimen/image_button_padding"
+            android:src="?attr/icon_refresh"
+            android:visibility="gone"
+            android:contentDescription="@string/regenerate_axolotl_key"/>
+
+    </LinearLayout>
+</RelativeLayout>
+</LinearLayout>
+<LinearLayout
+android:id="@+id/other_device_keys_card"
+android:layout_width="fill_parent"
+android:layout_height="wrap_content"
+android:layout_marginLeft="@dimen/activity_horizontal_margin"
+android:layout_marginRight="@dimen/activity_horizontal_margin"
+android:layout_marginTop="@dimen/activity_vertical_margin"
+android:layout_marginBottom="@dimen/activity_vertical_margin"
+android:background="@drawable/infocard_border"
+android:orientation="vertical"
+android:padding="@dimen/infocard_padding"
+android:visibility="gone">
+
+<TextView
+    android:id="@+id/other_device_keys_title"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:textColor="@color/black87"
+    android:textSize="?attr/TextSizeHeadline"
+    android:textStyle="bold"
+    android:text="@string/other_devices"/>
+
+<LinearLayout
+    android:id="@+id/other_device_keys"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:divider="?android:dividerHorizontal"
+    android:orientation="vertical"
+    android:showDividers="middle" >
+</LinearLayout>
+</LinearLayout>
+    </LinearLayout>
+    </ScrollView>
+
+<LinearLayout
+android:id="@+id/button_bar"
+android:layout_width="wrap_content"
+android:layout_height="wrap_content"
+android:layout_alignParentBottom="true"
+android:layout_alignParentStart="true"
+android:layout_alignParentEnd="true"
+android:layout_alignParentLeft="true"
+android:layout_alignParentRight="true" >
+
+<Button
+    android:id="@+id/cancel_button"
+    style="?android:attr/borderlessButtonStyle"
+    android:layout_width="0dp"
+    android:layout_height="wrap_content"
+    android:layout_weight="1"
+    android:text="@string/cancel"
+    android:textColor="@color/black87" />
+
+<View
+    android:layout_width="1dp"
+    android:layout_height="fill_parent"
+    android:layout_marginBottom="7dp"
+    android:layout_marginTop="7dp"
+    android:background="@color/black12" />
+
+<Button
+    android:id="@+id/save_button"
+    style="?android:attr/borderlessButtonStyle"
+    android:layout_width="0dp"
+    android:layout_height="wrap_content"
+    android:layout_weight="1"
+    android:enabled="false"
+    android:text="@string/save"
+    android:textColor="@color/black54" />
+</LinearLayout>
+
+    </RelativeLayout>
diff --git a/src/main/res/layout/message_received.xml b/src/main/res/layout/message_received.xml
index 83f622668..07cca2c1e 100644
--- a/src/main/res/layout/message_received.xml
+++ b/src/main/res/layout/message_received.xml
@@ -57,6 +57,7 @@
                 android:autoLink="web"
                 android:textColorLink="@color/white"
                 android:textColor="@color/white"
+                android:textColorHighlight="@color/grey800"
                 android:textSize="?attr/TextSizeBody" />
 
             <Button
diff --git a/src/main/res/layout/message_sent.xml b/src/main/res/layout/message_sent.xml
index 139dec0e8..d76117d89 100644
--- a/src/main/res/layout/message_sent.xml
+++ b/src/main/res/layout/message_sent.xml
@@ -57,6 +57,7 @@
                 android:autoLink="web"
                 android:textColorLink="@color/black87"
                 android:textColor="@color/black87"
+                android:textColorHighlight="@color/grey500"
                 android:textSize="?attr/TextSizeBody" />
 
             <Button
diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml
index 2789262e3..05c273054 100644
--- a/src/main/res/values-de/strings.xml
+++ b/src/main/res/values-de/strings.xml
@@ -449,4 +449,7 @@
   <string name="file_not_found_on_remote_host">Datei auf Server nicht gefunden</string>
   <string name="search_for_contacts_or_groups">Nach Kontakten oder Konferenzen suchen</string>
   <string name="is_typing">schreibt...</string>
+  <string name="username">Benutzername</string>
+	<string name="username_hint">Benutzername</string>
+	<string name="invalid_username">Das ist kein gültiger Benutzername</string>
 </resources>
diff --git a/src/main/res/values/colors.xml b/src/main/res/values/colors.xml
index a5d7eea30..c2a3ad60c 100644
--- a/src/main/res/values/colors.xml
+++ b/src/main/res/values/colors.xml
@@ -11,6 +11,7 @@
 	<color name="white70">#b2ffffff</color>
 	<color name="grey50">#fffafafa</color>
 	<color name="grey200">#ffeeeeee</color>
+	<color name="grey500">#ff9e9e9e</color>
 	<color name="grey800">#ff424242</color>
 	<color name="red500">#fff44336</color>
 	<color name="red800">#ffc62828</color>
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 4253c7a24..0c7557e4f 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -500,4 +500,7 @@
 	<string name="send_private_message">Send private message</string>
 	<string name="user_has_left_conference">%s has left the conference!</string>
 	<string name="is_typing">is typing...</string>
+	<string name="username">Username</string>
+	<string name="username_hint">Username</string>
+	<string name="invalid_username">This is not a valid username</string>
 </resources>