Merge branch 'development'

23 files changed, 367 insertions, 231 deletions

diff --git a/res/drawable-hdpi/ic_action_copy.png b/res/drawable-hdpi/ic_action_copy.png
index b47bb69c9..22327391e 100644
--- a/res/drawable-hdpi/ic_action_copy.png
+++ b/res/drawable-hdpi/ic_action_copy.png
diff --git a/res/drawable-mdpi/ic_action_copy.png b/res/drawable-mdpi/ic_action_copy.png
index 75788f1f9..713482020 100644
--- a/res/drawable-mdpi/ic_action_copy.png
+++ b/res/drawable-mdpi/ic_action_copy.png
diff --git a/res/drawable-xhdpi/ic_action_copy.png b/res/drawable-xhdpi/ic_action_copy.png
index a45423f69..5ddf15139 100644
--- a/res/drawable-xhdpi/ic_action_copy.png
+++ b/res/drawable-xhdpi/ic_action_copy.png
diff --git a/res/drawable-xxhdpi/ic_action_copy.png b/res/drawable-xxhdpi/ic_action_copy.png
index 3a0e8449e..a0508df8c 100644
--- a/res/drawable-xxhdpi/ic_action_copy.png
+++ b/res/drawable-xxhdpi/ic_action_copy.png
diff --git a/res/drawable/infocard_border.xml b/res/drawable/infocard_border.xml
new file mode 100644
index 000000000..7c7ded571
--- /dev/null
+++ b/res/drawable/infocard_border.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" >
+
+    <solid android:color="@color/primarybackground" />
+
+    <corners android:radius="2dp" />
+
+    <stroke
+        android:width="0.5dp"
+        android:color="@color/divider" >
+    </stroke>
+    
+    <padding
+        android:bottom="0dp"
+        android:left="0dp"
+        android:right="0dp"
+        android:top="0dp" />
+
+</shape>
\ No newline at end of file
diff --git a/res/drawable/section_header.xml b/res/drawable/section_header.xml
deleted file mode 100644
index 9db04f906..000000000
--- a/res/drawable/section_header.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle" >
-
-    <size
-        android:height="1.5dp"
-        android:width="2000dp" />
-
-    <solid android:color="@color/divider" />
-
-</shape>
\ No newline at end of file
diff --git a/res/layout/activity_contact_details.xml b/res/layout/activity_contact_details.xml
index f4fd9c1e1..f7cb2198c 100644
--- a/res/layout/activity_contact_details.xml
+++ b/res/layout/activity_contact_details.xml
@@ -1,126 +1,112 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/primarybackground" >
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:background="@color/secondarybackground" >
 
     <LinearLayout
-        android:layout_width="match_parent"
+        android:layout_width="fill_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical" >
 
-        <TextView
-            style="@style/sectionHeader"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:padding="8dp"
-            android:text="@string/action_contact_details"
-            android:textColor="@color/primarytext" />
-
         <RelativeLayout
-            android:layout_width="wrap_content"
+            android:layout_width="fill_parent"
             android:layout_height="wrap_content"
-            android:minHeight="88dp"
-            android:padding="8dp" >
+            android:layout_margin="8dp"
+            android:background="@drawable/infocard_border"
+            android:padding="16dp" >
 
             <QuickContactBadge
                 android:id="@+id/details_contact_badge"
                 android:layout_width="72dp"
                 android:layout_height="72dp"
-                android:layout_centerVertical="true"
+                android:layout_alignParentTop="true"
                 android:scaleType="centerCrop" />
 
             <LinearLayout
                 android:id="@+id/details_jidbox"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_centerVertical="true"
+                android:layout_marginLeft="16dp"
                 android:layout_toRightOf="@+id/details_contact_badge"
-                android:orientation="vertical"
-                android:paddingLeft="8dp" >
+                android:orientation="vertical" >
 
                 <TextView
                     android:id="@+id/details_contactjid"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:paddingLeft="8dp"
-                    android:singleLine="true"
+                    android:text="@string/account_settings_example_jabber_id"
                     android:textColor="@color/primarytext"
-                    android:textSize="?attr/TextSizeBody" />
+                    android:textSize="?attr/TextSizeHeadline"
+                    android:textStyle="bold" />
 
-                <TextView
-                    android:id="@+id/details_contactstatus"
+                <LinearLayout
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal" >
+
+                    <TextView
+                        android:id="@+id/details_contactstatus"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:textColor="@color/secondarytext"
+                        android:textSize="?attr/TextSizeBody" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text=" · "
+                        android:textColor="@color/secondarytext"
+                        android:textSize="?attr/TextSizeBody" />
+
+                    <TextView
+                        android:id="@+id/details_lastseen"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:singleLine="true"
+                        android:textColor="@color/secondarytext"
+                        android:textSize="?attr/TextSizeBody" />
+                </LinearLayout>
+
+                <CheckBox
+                    android:id="@+id/details_send_presence"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:paddingLeft="16dp"
+                    android:layout_marginTop="8dp"
+                    android:text="@string/send_presence_updates"
                     android:textColor="@color/primarytext"
-                    android:textSize="?attr/TextSizeHeadline"
-                    android:textStyle="bold" />
+                    android:textSize="?attr/TextSizeBody" />
 
-                <TextView
-                    android:id="@+id/details_lastseen"
+                <CheckBox
+                    android:id="@+id/details_receive_presence"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:paddingLeft="8dp"
-                    android:singleLine="true"
+                    android:text="@string/receive_presence_updates"
                     android:textColor="@color/primarytext"
                     android:textSize="?attr/TextSizeBody" />
             </LinearLayout>
-        </RelativeLayout>
-
-        <TextView
-            style="@style/sectionHeader"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:padding="8dp"
-            android:text="@string/your_account"
-            android:textColor="@color/primarytext" />
-
-        <TextView
-            android:id="@+id/details_account"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:paddingLeft="8dp"
-            android:textColor="@color/primarytext"
-            android:textSize="?attr/TextSizeBody" />
-
-        <TextView
-            style="@style/sectionHeader"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:padding="8dp"
-            android:text="@string/subscriptions"
-            android:textColor="@color/primarytext" />
-
-        <CheckBox
-            android:id="@+id/details_send_presence"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/send_presence_updates"
-            android:textColor="@color/primarytext"
-            android:textSize="?attr/TextSizeBody" />
 
-        <CheckBox
-            android:id="@+id/details_receive_presence"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/receive_presence_updates"
-            android:textColor="@color/primarytext"
-            android:textSize="?attr/TextSizeBody" />
-
-        <TextView
-            style="@style/sectionHeader"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:padding="8dp"
-            android:text="@string/keys" />
+            <TextView
+                android:id="@+id/details_account"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentRight="true"
+                android:layout_below="@+id/details_jidbox"
+                android:layout_marginTop="32dp"
+                android:text="@string/using_account"
+                android:textColor="@color/secondarytext"
+                android:textSize="?attr/TextSizeInfo" />
+        </RelativeLayout>
 
         <LinearLayout
             android:id="@+id/details_contact_keys"
-            android:layout_width="match_parent"
+            android:layout_width="fill_parent"
             android:layout_height="wrap_content"
+            android:layout_margin="8dp"
+            android:background="@drawable/infocard_border"
             android:divider="?android:dividerHorizontal"
             android:orientation="vertical"
+            android:padding="8dp"
             android:showDividers="middle" >
         </LinearLayout>
     </LinearLayout>
diff --git a/res/layout/activity_edit_account.xml b/res/layout/activity_edit_account.xml
index 91bda7b10..97289628c 100644
--- a/res/layout/activity_edit_account.xml
+++ b/res/layout/activity_edit_account.xml
@@ -2,7 +2,7 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/primarybackground" >
+    android:background="@color/secondarybackground" >
 
     <ScrollView
         android:layout_width="fill_parent"
@@ -19,8 +19,10 @@
                 android:id="@+id/editor"
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
+                android:layout_margin="8dp"
+                android:background="@drawable/infocard_border"
                 android:orientation="vertical"
-                android:padding="8dp" >
+                android:padding="16dp" >
 
                 <TextView
                     android:layout_width="wrap_content"
@@ -34,7 +36,10 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:hint="@string/account_settings_example_jabber_id"
-                    android:inputType="textEmailAddress" />
+                    android:inputType="textEmailAddress"
+                    android:textColor="@color/primarytext"
+                    android:textColorHint="@color/secondarytext"
+                    android:textSize="?attr/TextSizeBody" />
 
                 <TextView
                     android:layout_width="wrap_content"
@@ -49,7 +54,10 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:hint="@string/password"
-                    android:inputType="textPassword" />
+                    android:inputType="textPassword"
+                    android:textColor="@color/primarytext"
+                    android:textColorHint="@color/secondarytext"
+                    android:textSize="?attr/TextSizeBody" />
 
                 <CheckBox
                     android:id="@+id/account_register_new"
@@ -76,31 +84,25 @@
                     android:layout_marginTop="8dp"
                     android:hint="@string/confirm_password"
                     android:inputType="textPassword"
-                    android:visibility="gone" />
+                    android:visibility="gone"
+                    android:textColor="@color/primarytext"
+                    android:textColorHint="@color/secondarytext"
+                    android:textSize="?attr/TextSizeBody" />
             </LinearLayout>
 
-            <LinearLayout
+           <LinearLayout
                 android:id="@+id/stats"
                 android:layout_width="fill_parent"
                 android:layout_height="fill_parent"
-                android:layout_marginTop="8dp"
+                android:layout_margin="8dp"
+                android:background="@drawable/infocard_border"
                 android:orientation="vertical"
                 android:padding="16dp"
                 android:visibility="gone" >
 
-                <TextView
-                    android:layout_width="fill_parent"
-                    android:layout_height="wrap_content"
-                    android:gravity="center_horizontal"
-                    android:text="@string/additional_information"
-                    android:textColor="@color/secondarytext"
-                    android:textSize="?attr/TextSizeHeadline"
-                    android:textStyle="bold" />
-
                 <TableLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="8dp"
                     android:stretchColumns="1" >
 
                     <TableRow
@@ -110,13 +112,17 @@
                         <TextView
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:text="@string/server_info_session_established" />
+                            android:text="@string/server_info_session_established"
+                            android:textColor="@color/primarytext"
+                            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:layout_gravity="right"
+                            android:textColor="@color/primarytext"
+                            android:textSize="?attr/TextSizeBody" />
                     </TableRow>
 
                     <TableRow
@@ -127,13 +133,16 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:text="@string/server_info_pep"
-                            android:textColor="@color/primarytext" />
+                            android:textColor="@color/primarytext"
+                            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:layout_gravity="right"
+                            android:textColor="@color/primarytext"
+                            android:textSize="?attr/TextSizeBody" />
                     </TableRow>
 
                     <TableRow
@@ -143,13 +152,17 @@
                         <TextView
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:text="@string/server_info_stream_management" />
+                            android:text="@string/server_info_stream_management"
+                            android:textColor="@color/primarytext"
+                            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:layout_gravity="right"
+                            android:textColor="@color/primarytext"
+                            android:textSize="?attr/TextSizeBody" />
                     </TableRow>
 
                     <TableRow
@@ -159,59 +172,64 @@
                         <TextView
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:text="@string/server_info_carbon_messages" />
+                            android:text="@string/server_info_carbon_messages"
+                            android:textColor="@color/primarytext"
+                            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:layout_gravity="right"
+                            android:textColor="@color/primarytext"
+                            android:textSize="?attr/TextSizeBody" />
                     </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="?attr/TextSizeHeadline"
-                    android:textStyle="bold" />
+
 
                 <RelativeLayout
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
-                    android:layout_marginTop="8dp">
+                    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"
-                        android:layout_centerVertical="true">
+                        android:orientation="vertical">
 
                         <TextView
                             android:id="@+id/otr_fingerprint"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
+                            android:textColor="@color/primarytext"
                             android:textSize="?attr/TextSizeBody"
                             android:typeface="monospace" />
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:textColor="@color/secondarytext"
+                            android:textSize="?attr/TextSizeInfo"
+                            android:text="@string/otr_fingerprint"/>
                     </LinearLayout>
 
                     <ImageButton
                         android:id="@+id/action_copy_to_clipboard"
-                        android:layout_width="32dp"
-                        android:layout_height="32dp"
-                        android:background="?android:selectableItemBackground"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
                         android:layout_alignParentRight="true"
                         android:layout_centerVertical="true"
-                        android:padding="4dp"
-                        android:scaleType="fitXY"
+                        android:background="?android:selectableItemBackground"
+                        android:padding="8dp"
                         android:src="@drawable/ic_action_copy"
-                        android:visibility="invisible" />
+                        android:visibility="visible" />
                 </RelativeLayout>
+
+               
             </LinearLayout>
         </LinearLayout>
     </ScrollView>
@@ -251,4 +269,4 @@
             android:textColor="@color/secondarytext" />
     </LinearLayout>
 
-</RelativeLayout>
+</RelativeLayout>
\ No newline at end of file
diff --git a/res/layout/activity_muc_details.xml b/res/layout/activity_muc_details.xml
index 1a676548b..f689f10d3 100644
--- a/res/layout/activity_muc_details.xml
+++ b/res/layout/activity_muc_details.xml
@@ -1,46 +1,35 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/primarybackground" >
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:background="@color/secondarybackground" >
 
     <LinearLayout
-        android:layout_width="wrap_content"
+        android:layout_width="fill_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical" >
 
-        <TextView
-            style="@style/sectionHeader"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:padding="8dp"
-            android:text="@string/muc_details_conference" />
+    <LinearLayout
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:layout_margin="8dp"
+        android:background="@drawable/infocard_border"
+        android:orientation="vertical"
+        android:padding="16dp" >
 
         <TextView
             android:id="@+id/muc_jabberid"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:padding="8dp"
-            android:singleLine="true"
             android:text="@string/account_settings_example_jabber_id"
             android:textColor="@color/primarytext"
-            android:textSize="?attr/TextSizeBody" />
-
-        <TextView
-            style="@style/sectionHeader"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:paddingLeft="8dp"
-            android:paddingRight="8dp"
-            android:paddingTop="8dp"
-            android:text="@string/you" />
-
+            android:textSize="?attr/TextSizeHeadline"
+            android:textStyle="bold"
+            android:layout_marginBottom="16dp"/>
+        
         <RelativeLayout
             android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:background="?android:attr/activatedBackgroundIndicator"
-            android:padding="8dp"
-            android:paddingBottom="8dp" >
+            android:layout_height="wrap_content">
 
             <ImageView
                 android:id="@+id/your_photo"
@@ -85,22 +74,26 @@
                 android:padding="8dp"
                 android:src="@drawable/ic_action_edit_dark" />
         </RelativeLayout>
-
-        <LinearLayout
-            android:id="@+id/muc_more_details"
-            android:layout_width="fill_parent"
-            android:layout_height="fill_parent"
-            android:orientation="vertical" >
-
-            <TextView
-                android:id="@+id/muc_participants_header"
-                style="@style/sectionHeader"
+         <TextView
+                android:id="@+id/details_account"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:paddingLeft="8dp"
-                android:paddingRight="8dp"
-                android:paddingTop="8dp"
-                android:text="@string/muc_details_other_members" />
+                android:layout_gravity="right"
+                android:layout_marginTop="32dp"
+                android:text="@string/using_account"
+                android:textColor="@color/secondarytext"
+                android:textSize="?attr/TextSizeInfo" />
+    </LinearLayout>
+
+    <LinearLayout
+        android:id="@+id/muc_more_details"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:layout_margin="8dp"
+        android:background="@drawable/infocard_border"
+        android:orientation="vertical"
+        android:padding="8dp" >
+
 
             <LinearLayout
                 android:id="@+id/muc_members"
@@ -111,7 +104,6 @@
                 android:orientation="vertical"
                 android:showDividers="middle" >
             </LinearLayout>
-        </LinearLayout>
 
         <Button
             android:id="@+id/invite"
@@ -123,4 +115,5 @@
             android:text="@string/invite_contact" />
     </LinearLayout>
 
+</LinearLayout>
 </ScrollView>
\ No newline at end of file
diff --git a/res/layout/contact_key.xml b/res/layout/contact_key.xml
index e10f8420a..7053857fb 100644
--- a/res/layout/contact_key.xml
+++ b/res/layout/contact_key.xml
@@ -16,14 +16,15 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:textColor="@color/primarytext"
-            android:textSize="?attr/TextSizeHeadline"
+            android:textSize="?attr/TextSizeBody"
             android:typeface="monospace" />
 
         <TextView
             android:id="@+id/key_type"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:textColor="@color/secondarytext" />
+            android:textColor="@color/secondarytext"
+            android:textSize="?attr/TextSizeInfo"/>
     </LinearLayout>
 
     <ImageButton
diff --git a/res/layout/message_received.xml b/res/layout/message_received.xml
index 730d00d53..39bb842ac 100644
--- a/res/layout/message_received.xml
+++ b/res/layout/message_received.xml
@@ -15,7 +15,8 @@
         android:layout_alignParentBottom="true"
         android:layout_toRightOf="@+id/message_photo"
         android:background="@drawable/message_border"
-        android:minHeight="48dp" >
+        android:minHeight="48dp"
+        android:longClickable="true">
 
         <LinearLayout
             android:layout_width="wrap_content"
@@ -43,7 +44,6 @@
                 android:layout_height="wrap_content"
                 android:autoLink="web"
                 android:textColor="@color/primarytext"
-                android:textIsSelectable="true"
                 android:textSize="?attr/TextSizeBody" />
 
             <Button
diff --git a/res/layout/message_sent.xml b/res/layout/message_sent.xml
index 28f3ddc63..3e8546432 100644
--- a/res/layout/message_sent.xml
+++ b/res/layout/message_sent.xml
@@ -15,7 +15,8 @@
         android:layout_alignParentBottom="true"
         android:layout_toLeftOf="@+id/message_photo"
         android:background="@drawable/message_border"
-        android:minHeight="48dp" >
+        android:minHeight="48dp"
+        android:longClickable="true">
 
         <LinearLayout
             android:layout_width="wrap_content"
@@ -43,8 +44,15 @@
                 android:layout_height="wrap_content"
                 android:autoLink="web"
                 android:textColor="@color/primarytext"
-                android:textIsSelectable="true"
                 android:textSize="?attr/TextSizeBody" />
+            
+             <Button
+                android:id="@+id/download_button"
+                style="?android:attr/buttonStyleSmall"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/download_image"
+                android:visibility="gone" />
 
             <LinearLayout
                 android:layout_width="wrap_content"
diff --git a/res/menu/message_context.xml b/res/menu/message_context.xml
new file mode 100644
index 000000000..80d4d1960
--- /dev/null
+++ b/res/menu/message_context.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android" >
+
+    <item
+        android:id="@+id/copy_text"
+        android:title="@string/copy_text"/>
+    <item
+        android:id="@+id/share_image"
+        android:title="@string/share_image"/>
+    <item
+        android:id="@+id/copy_url"
+        android:title="@string/copy_original_url"/>
+    <item
+        android:id="@+id/send_again"
+        android:title="@string/send_again"/>
+    <item
+        android:id="@+id/download_image"
+        android:title="@string/download_image"/>
+
+</menu>
\ No newline at end of file
diff --git a/res/values-de/arrays.xml b/res/values-de/arrays.xml
index 9b429c5a7..ed5d47b54 100644
--- a/res/values-de/arrays.xml
+++ b/res/values-de/arrays.xml
@@ -22,7 +22,7 @@
     </string-array>
     <string-array name="mute_options_descriptions">
         <item>30 Minuten</item>
-        <item>eine Stunde</item>
+        <item>1 Stunde</item>
         <item>2 Stunden</item>
         <item>8 Stunden</item>
         <item>bis auf Widerruf</item>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 72121774b..ca190deb6 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -51,7 +51,7 @@
     <string name="send_now">Jetzt abschicken</string>
     <string name="send_never">Nie mehr nachfragen</string>
     <string name="problem_connecting_to_account">Es gibt Probleme beim Verbindungsaufbau mit einem Konto</string>
-    <string name="problem_connecting_to_accounts">Es gibt Probleme beim Verbindungsaufbau mit mehreren Konto</string>
+    <string name="problem_connecting_to_accounts">Es gibt Probleme beim Verbindungsaufbau mit mehreren Konten</string>
     <string name="touch_to_fix">Drücke hier, um das Konto zu verwalten</string>
     <string name="attach_file">Datei anfügen</string>
     <string name="not_in_roster">Der Kontakt ist nicht in deiner Kontaktliste. Möchtest du ihn hinzufügen?</string>
@@ -65,7 +65,7 @@
     <string name="clear_histor_msg">Möchtest du alle Nachrichten in dieser Unterhaltung löschen?\n\n<b>Achtung:</b> Dies beeinflusst nicht Nachrichten, die auf anderen Geräten oder Servern gespeichert sind.</string>
     <string name="delete_messages">Nachrichten löschen</string>
     <string name="also_end_conversation">Diese Unterhaltung danach beenden</string>
-    <string name="choose_presence">Choose presence to contact</string>
+    <string name="choose_presence">Ressource des Kontakts auswählen</string>
     <string name="send_plain_text_message">Unverschlüsselt schreiben</string>
     <string name="send_otr_message">OTR-verschlüsselt schreiben</string>
     <string name="send_pgp_message">OpenPGP-verschlüsselt schreiben</string>
@@ -81,9 +81,9 @@
     <string name="offering">angeboten&#8230;</string>
     <string name="waiting">warten&#8230;</string>
     <string name="no_pgp_key">Kein OpenPGP-Schlüssel gefunden</string>
-    <string name="contact_has_no_pgp_key">Conversations ist nicht in der Lage, deine Nachrichten zu verschlüsseln, weil dein Kontakt seinen oder ihren Schlüssel nicht preisgibt.\n\n<small>Bitte sag deinem Kontakt, er oder sie möge bitte OpenPGP einrichten.</small></string>
+    <string name="contact_has_no_pgp_key">Conversations ist nicht in der Lage, deine Nachrichten zu verschlüsseln, weil dein Kontakt seinen oder ihren Schlüssel nicht preisgibt.\n\n<small>Bitte sag deinem Kontakt, er oder sie möge OpenPGP einrichten.</small></string>
     <string name="no_pgp_keys">Keine OpenPGP-Schlüssel gefunden</string>
-    <string name="contacts_have_no_pgp_keys">Conversations ist nicht in der Lage, deine Nachrichten zu verschlüsseln, weil dein Kontakt seinen oder ihren Schlüssel nicht preisgibt.\n\n<small>Bitte sag deinem Kontakt, er oder sie möge bitte OpenPGP einrichten.</small></string>
+    <string name="contacts_have_no_pgp_keys">Conversations ist nicht in der Lage, deine Nachrichten zu verschlüsseln, weil deine Kontakte ihre Schlüssel nicht preisgeben.\n\n<small>Bitte sag deinen Kontakten, sie mögen OpenPGP einrichten.</small></string>
     <string name="encrypted_message_received"><i>Verschlüsselte Nachricht erhalten. Drücke hier, um sie anzuzeigen und zu entschlüsseln.</i></string>
     <string name="encrypted_image_received"><i>Verschlüsseltes Bild erhalten. Drücke hier, um es anzuzeigen und zu entschlüsseln.</i></string>
     <string name="image_file"><i>Bild erhalten. Drücke hier, um es anzuzeigen.</i></string>
@@ -100,7 +100,7 @@
     <string name="pref_sound">Klingelton</string>
     <string name="pref_sound_summary">Spiele Klingelton, wenn eine neue Nachricht ankommt</string>
     <string name="pref_conference_notifications">Konferenz-Benachrichtigungen</string>
-    <string name="pref_conference_notifications_summary">Benachrichtige mich bei jeder Konferenznachricht und nicht nur, wenn ich angesprochen werde.</string>
+    <string name="pref_conference_notifications_summary">Benachrichtige mich bei jeder Konferenznachricht und nicht nur, wenn ich angesprochen werde</string>
     <string name="pref_notification_grace_period">Gnadenfrist</string>
     <string name="pref_notification_grace_period_summary">Deaktiviere Benachrichtigungen für eine kurze Zeit nach Erhalt einer Nachricht, die von einem anderen deiner Clients kommt.</string>
     <string name="pref_advanced_options">Erweiterte Optionen</string>
@@ -233,7 +233,7 @@
     <string name="skip">Überspringen</string>
     <string name="pref_ui_options">Benutzeroberfläche</string>
     <string name="pref_use_indicate_received">Anfrage für Nachrichten Empfang</string>
-    <string name="pref_use_indicate_received_summary">Empfangene Nachrichten werden mit einem grünen Häckchen markiert. Bitte beachte das dies nicht unbedingt in allen Fällen funktioniert.</string>
+    <string name="pref_use_indicate_received_summary">Empfangene Nachrichten werden mit einem grünen Häckchen markiert. Bitte beachte, dass dies nicht in allen Fällen funktioniert.</string>
     <string name="disable_notifications">Benachrichtigungen deaktivieren</string>
     <string name="disable_notifications_for_this_conversation">Benachrichtigungen für diese Unterhaltung deaktivieren</string>
     <string name="notifications_disabled">Benachrichtigungen sind deaktiviert</string>
@@ -252,9 +252,11 @@
     <string name="pref_force_encryption_summary">Nachrichten immer verschlüsseln (außer für Konferenzen)</string>
     <string name="pref_dont_save_encrypted">Verschlüsselte Nachrichten nicht speichern</string>
     <string name="pref_dont_save_encrypted_summary">Achtung: Kann zu Nachrichtenverlust führen</string>
+    <string name="pref_enable_legacy_ssl">Alte SSL-Version aktivieren</string>
+    <string name="pref_enable_legacy_ssl_summary">Aktiviert SSLv3-Unterstützung für alte Server. Achtung: SSLv3 ist unsicher.</string>
     <string name="pref_expert_options">Einstellungen für Experten</string>
     <string name="pref_expert_options_summary">Hier bitte vorsichtig sein</string>
-    <string name="pref_use_larger_font">Schriftgröße erhöhen</string>
+    <string name="pref_use_larger_font">Schrift vergrößern</string>
     <string name="pref_use_larger_font_summary">Überall in der App eine größere Schrift verwenden</string>
     <string name="pref_use_send_button_to_indicate_status">Absende-Knopf zeigt Online-Status an</string>
     <string name="pref_use_send_button_to_indicate_status_summary">Absende-Knopf einfärben, um den Online-Status des Kontakts zu signalisieren</string>
@@ -265,5 +267,19 @@
     <string name="conference_banned">Du wurdest aus dem Konferenzraum verbannt</string>
     <string name="conference_members_only">Der Konferenzraum ist nur für Mitglieder</string>
     <string name="conference_kicked">Du wurdest aus dem Konferenzraum geworfen</string>
+    <string name="using_account">Verwende Konto %s</string>
+    <string name="checking_image">Prüfe Bild auf HTTP-Host</string>
+    <string name="image_file_deleted">Bilddatei wurde gelöscht</string>
+    <string name="not_connected_try_again">Nicht verbunden, bitte später versuchen</string>
+    <string name="check_image_filesize">Bildgröße prüfen</string>
+    <string name="message_options">Nachrichtenoptionen</string>
+    <string name="copy_text">Text kopieren</string>
+    <string name="share_image">Bild teilen</string>
+    <string name="copy_original_url">Original-URL kopieren</string>
+    <string name="send_again">Erneut senden</string>
+    <string name="image_url">Bild-URL</string>
+    <string name="message_text">Nachrichtentext</string>
+    <string name="url_copied_to_clipboard">URL in Zwischenablage kopiert</string>
+    <string name="message_copied_to_clipboard">Nachricht in Zwischenablage kopiert</string>
 
 </resources>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 7fdc95c05..47424d006 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -250,6 +250,8 @@
     <string name="pref_force_encryption_summary">Siempre enviar mensajes encriptados (excepto para conferencias)</string>
     <string name="pref_dont_save_encrypted">No guardar mensajes encriptados</string>
     <string name="pref_dont_save_encrypted_summary">Aviso: Esto podría llevar a pérdida de mensajes</string>
+    <string name="pref_enable_legacy_ssl">Habilitar SSL heredado</string>
+    <string name="pref_enable_legacy_ssl_summary">Habilita soporte SSLv3 para servidores heredados. Advertencia: SSLv3 se considera no seguro.</string>
     <string name="pref_expert_options">Ajustes avanzados</string>
     <string name="pref_expert_options_summary">Por favor, cuidado con estas opciones</string>
     <string name="pref_use_larger_font">Incrementar tamaño de fuente</string>
@@ -265,5 +267,19 @@
     <string name="conference_banned">Tu entrada a esta conferencia ha sido prohibida</string>
     <string name="conference_members_only">Esta conferencia es solo para miembros</string>
     <string name="conference_kicked">Has sido expulsado de esta conferencia</string>
+    <string name="using_account">Usando cuenta %s</string>
+    <string name="checking_image">Comprobando imagen en servidor HTTP</string>
+    <string name="image_file_deleted">El archivo de imagen ha sido eliminado</string>
+    <string name="not_connected_try_again">No estás concectado. Inténtalo más tarde</string>
+    <string name="check_image_filesize">Comprobar el tamaño del archivo de imagen</string>
+    <string name="message_options">Opciones de mensaje</string>
+    <string name="copy_text">Copiar texto</string>
+    <string name="share_image">Compartir imagen</string>
+    <string name="copy_original_url">Copiar URL original</string>
+    <string name="send_again">Volver a enviar</string>
+    <string name="image_url">URL Imagen</string>
+    <string name="message_text">Mensaje de texto</string>
+    <string name="url_copied_to_clipboard">URL copiada al portapapeles</string>
+    <string name="message_copied_to_clipboard">Mensaje copiado al portapapeles</string>
 
 </resources>
\ No newline at end of file
diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml
index 4d3522fd4..8896e9b58 100644
--- a/res/values-eu/strings.xml
+++ b/res/values-eu/strings.xml
@@ -205,7 +205,7 @@
     <string name="conference_address">Konferentziaren helbidea</string>
     <string name="conference_address_example">gela@conference.example.com</string>
     <string name="save_as_bookmark">Gorde laster-marka bezala</string>
-    <string name="delete_bookmark">Laster-marka ezbatu</string>
+    <string name="delete_bookmark">Laster-marka ezabatu</string>
     <string name="bookmark_already_exists">Laster-marka hau existitzen da dagoeneko</string>
     <string name="you">Zu</string>
     <string name="action_edit_subject">Konferentziaren gaia editatu</string>
@@ -250,11 +250,27 @@
     <string name="pref_force_encryption_summary">Mezuak beti enkriptatuta bidali (konferentzietan izan ezik)</string>
     <string name="pref_dont_save_encrypted">Ez gorde enkriptatutako mezuak</string>
     <string name="pref_dont_save_encrypted_summary">Adi: Honek mezuen galera ekar lezake</string>
+    <string name="pref_enable_legacy_ssl">Oinordetutako SSL gaitu</string>
+    <string name="pref_enable_legacy_ssl_summary">SSLv3 gaitzen du oinordetutako zerbitzarietarako. Adi: SSLv3 ez segurutzat hartzen da.</string>
     <string name="pref_expert_options">Adituentzako aukerak</string>
     <string name="pref_expert_options_summary">Mesedez kontuz ibili hauekin</string>
     <string name="pref_use_larger_font">Letraren tamaina handitu</string>
     <string name="pref_use_larger_font_summary">Letra tamaina handiagoa erabili aplikazio osoan zehar</string>
     <string name="pref_use_send_button_to_indicate_status">Bidaltze botoiak egoera adierazten du</string>
+    <string name="pref_use_indicate_received">Mezuen jasotzea eskatu</string>
+    <string name="pref_use_indicate_received_summary">Jasotako mezuak marka berde batekin markatuko dira. Baliteke kasu guztietan ez funtzionatzea.</string>
     <string name="pref_use_send_button_to_indicate_status_summary">Bidaltze botoia koloreztatu kontaktu baten egoera adierazteko</string>
+    <string name="pref_expert_options_other">Besteak</string>
+    <string name="pref_conference_name">Konferentziaren izena</string>
+    <string name="pref_conference_name_summary">Erabili gelaren gaia konferentziak identifikatzeko eta ez JIDa</string>
+    <string name="toast_message_otr_fingerprint">OTR hatz-marka arbelara kopiatu da</string>
+    <string name="conference_banned">Konferentzia honetara sartzea debekatuta duzu</string>
+    <string name="conference_members_only">Konferentzia hau kideentzat da soilik</string>
+    <string name="conference_kicked">Konferentzia honetatik kanporatua izan zara</string>
+    <string name="using_account">%s kontua erabiltzen</string>
+    <string name="checking_image">Irudia egiaztatzen HTTP ostalarian</string>
+    <string name="image_file_deleted">Irudia ezabatu egin da</string>
+    <string name="not_connected_try_again">Ez zaude konektatuta. Saiatu beranduago berriz</string>
+    <string name="check_image_filesize">Irudiaren tamaina egiaztatu</string>
 
-</resources>
\ No newline at end of file
+</resources>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index e15ef416f..e1db316dc 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -87,6 +87,7 @@
     <string name="encrypted_message_received"><i>Message chiffré reçu. Appuyez pour le déchiffrer.</i></string>
     <string name="encrypted_image_received"><i>Image chiffrée reçue. Appuyez pour la déchiffrer.</i></string>
     <string name="image_file"><i>Image reçue. Appuyez pour visualiser.</i></string>
+    <string name="pref_general">Général</string>
     <string name="pref_xmpp_resource">Ressource XMPP</string>
     <string name="pref_xmpp_resource_summary">Nom permettant d\'identifier ce client XMPP</string>
     <string name="pref_accept_files">Accepter les fichiers</string>
@@ -107,6 +108,7 @@
     <string name="pref_never_send_crash_summary">En envoyant des logs vous aidez au développement de Conversations.</string>
     <string name="pref_confirm_messages">Confirmation de lecture</string>
     <string name="pref_confirm_messages_summary">Informer l\'expéditeur d\'un message de sa bonne réception.</string>
+    <string name="pref_ui_options">Options d\'affichage</string>
     <string name="openpgp_error">Une erreur s\'est produite via OpenKeychain</string>
     <string name="error_decrypting_file">Erreur d\'E/S lors du déchiffrement du fichier</string>
     <string name="accept">Accepter</string>
@@ -145,6 +147,8 @@
     <string name="mgmt_account_edit">Modifier le compte</string>
     <string name="mgmt_account_delete">Supprimer</string>
     <string name="mgmt_account_disable">Désactiver temporairement</string>
+    <string name="mgmt_account_publish_avatar">Publier un avatar</string>
+    <string name="mgmt_account_publish_pgp">Publier la clef publique OpenPGP</string>
     <string name="mgmt_account_enable">Activer</string>
     <string name="mgmt_account_are_you_sure">Êtes-vous sûr?</string>
     <string name="mgmt_account_delete_confirm_text">En supprimant votre compte, votre historique de conversations sera perdu!</string>
@@ -169,6 +173,9 @@
     <string name="muc_details_other_members">Autres membres</string>
     <string name="server_info_carbon_messages">Copies carbone</string>
     <string name="server_info_stream_management">Gestion des flux</string>
+    <string name="server_info_pep">XEP-0163: PEP (Avatars)</string>
+    <string name="server_info_available">disponible</string>
+    <string name="server_info_unavailable">indisponible</string>
     <string name="missing_public_keys">Aucune annonce de clef publique</string>
     <string name="last_seen_now">en ligne à l\'instant</string>
     <string name="last_seen_min">en ligne il y a 1 minute</string>
@@ -207,6 +214,60 @@
     <string name="contact_added_you">Votre correspondant vous a ajouté dans sa liste de contacts</string>
     <string name="add_back">Ajouter également</string>
     <string name="contact_has_read_up_to_this_point">%s a lu les messages précédents.</string>
-    <string name="pref_ui_options">Options d\'affichage</string>
+    <string name="publish">Publier</string>
+    <string name="touch_to_choose_picture">Toucher l\'avatar pour choisir une image depuis la galerie.</string>
+    <string name="publish_avatar_explanation">Nota Bene: Les personnes ayant activé les mises jour de présence verront cette image.</string>
+    <string name="publishing">Mise à jour&#8230;</string>
+    <string name="error_publish_avatar_server_reject">Le serveur a rejeté votre envoi d\'image</string>
+    <string name="error_publish_avatar_converting">Une erreur s\'est produite pendant la conversion de votre image.</string>
+    <string name="error_saving_avatar">Impossible de stocker l\'image sur le disque</string>
+    <string name="or_long_press_for_default">(Un appui long réinitialise le paramètre par defaut)</string>
+    <string name="error_publish_avatar_no_server_support">Votre serveur n\'autorise pas l\'envoi d\'avatars</string>
+    <string name="private_message">chuchoté</string>
+    <string name="private_message_to">pour %s</string>
+    <string name="send_private_message_to">Envoyer un message privé à %s</string>
+    <string name="connect">Se connecter</string>
+    <string name="account_already_exists">Ce compte existe déjà</string>
+    <string name="next">suivant</string>
+    <string name="server_info_session_established">Session établie</string>
+    <string name="additional_information">Informations supplémentaires</string>
+    <string name="skip">Passer</string>
+	<string name="disable_notifications">Désactiver les notifications</string>
+    <string name="disable_notifications_for_this_conversation">Désactiver les notifications pour cette conversation</string>
+    <string name="notifications_disabled">Notifications are Désactivées</string>
+    <string name="enable">Activer</string>
+    <string name="conference_requires_password">La conférence necessite un mot de passe</string>
+    <string name="enter_password">Entrer le mot de passe</string>
+    <string name="missing_presence_updates">Mise à jour de présence non connue</string>
+    <string name="request_presence_updates">Merci de demander à votre contact de fournir les mises à jour de présence.\n\n<small>Cela permettra de savoir quel matériel utilise votre contact.</small></string>
+    <string name="request_now">Demander maintenant</string>
+    <string name="delete_fingerprint">Supprimer l\'empreinte</string>
+    <string name="sure_delete_fingerprint">Etes-vous sûr de vouloir supprimer l\'empreinte?</string>
+    <string name="ignore">Ignorer</string>
+    <string name="without_mutual_presence_updates"><b>Attention:</b> Ceci peut poser problème si l\'un des deux correspondants n\'a pas activé les mises à jour de présence.\n\n<small>Go to contact details to verify your presence subscriptions.</small></string>
+    <string name="pref_encryption_settings">Paramètres de chiffrement</string>
+    <string name="pref_force_encryption">Forcer le chiffrement de bout en bout</string>
+    <string name="pref_force_encryption_summary">Toujours envoyer des messages chiffrés (sauf pour les conférences)</string>
+    <string name="pref_dont_save_encrypted">Ne pas sauvegarder les messages chiffrés</string>
+    <string name="pref_dont_save_encrypted_summary">Attention: Celà peut mener à une perte de messages</string>
+    <string name="pref_expert_options">Options avancées</string>
+    <string name="pref_expert_options_summary">A utiliser avec précautions</string>
+    <string name="pref_use_larger_font">Augmenter la taille du texte</string>
+    <string name="pref_use_larger_font_summary">Augmenter la taille du texte partout dans l\'application</string>
+    <string name="pref_use_send_button_to_indicate_status">Le bouton Envoyer permet d\'indiquer le statut</string>
+    <string name="pref_use_indicate_received">Accusé de reception</string>
+    <string name="pref_use_indicate_received_summary">Les messages recus seront marqués d\'une coche verte si disponible</string>
+    <string name="pref_use_send_button_to_indicate_status_summary">Adapter la couleur du bouton Envoyer pour indiquer le statut</string>
+    <string name="pref_expert_options_other">Autres</string>
+    <string name="pref_conference_name">Nom de la conférence </string>
+    <string name="pref_conference_name_summary">Identifier la conférence par son nom plutot que par son JID</string>
+    <string name="toast_message_otr_fingerprint">Empreinte OTR copiée dans le presse-papier!</string>
+    <string name="conference_banned">Vous êtes interdit de cette conférence</string>
+    <string name="conference_members_only">Cette conférence est réservée aux membres</string>
+    <string name="conference_kicked">Vous avez été éjecté de cette conférence</string>
+    <string name="using_account">utiliser le compte %s</string>
+    <string name="checking_image">Vérification de l\'image</string>
+    <string name="image_file_deleted">L\'image a été suprimée</string>
+    <string name="not_connected_try_again">Vous n\'êtes pas connecté. Merci de retenter plus tard.</string>
 
-</resources>
\ No newline at end of file
+</resources>
diff --git a/res/values-nl/styles.xml b/res/values-nl/styles.xml
deleted file mode 100644
index 1468283ed..000000000
--- a/res/values-nl/styles.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<resources xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <style name="sectionHeader" parent="android:Widget.Holo.Light.TextView">
-        <item name="android:drawableBottom">@drawable/section_header</item>
-        <item name="android:drawablePadding">4dp</item>
-        <item name="android:layout_marginTop">8dp</item>
-        <item name="android:textSize">14sp</item>
-        <item name="android:textAllCaps">true</item>
-        <item name="android:textColor">#5b5b5b</item>
-        <item name="android:textStyle">bold</item>
-    </style>
-
-    <style name="Divider">
-        <item name="android:layout_width">match_parent</item>
-        <item name="android:layout_height">1.5dp</item>
-        <item name="android:background">#b7b7b7</item>
-    </style>
-
-</resources>
\ No newline at end of file
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 1a4fd25d1..4acc9e620 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -22,7 +22,7 @@
     </string-array>
     <string-array name="mute_options_descriptions">
         <item>30 minutes</item>
-        <item>one hour</item>
+        <item>1 hour</item>
         <item>2 hours</item>
         <item>8 hours</item>
         <item>until further notice</item>
@@ -36,4 +36,4 @@
         <item>-1</item>
     </integer-array>
 
-</resources>
\ No newline at end of file
+</resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 58af226b1..e941ed6dc 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -250,13 +250,15 @@
     <string name="pref_force_encryption_summary">Always send messages encrypted (except for conferences)</string>
     <string name="pref_dont_save_encrypted">Don’t save encrypted messages</string>
     <string name="pref_dont_save_encrypted_summary">Warning: This could lead to message loss</string>
+    <string name="pref_enable_legacy_ssl">Enable legacy SSL</string>
+    <string name="pref_enable_legacy_ssl_summary">Enables SSLv3 support for legacy servers. Warning: SSLv3 is considered insecure.</string>
     <string name="pref_expert_options">Expert options</string>
-    <string name="pref_expert_options_summary">Please be very careful with those</string>
+    <string name="pref_expert_options_summary">Please be careful with these</string>
     <string name="pref_use_larger_font">Increase font size</string>
     <string name="pref_use_larger_font_summary">Use larger font sizes across the entire app</string>
     <string name="pref_use_send_button_to_indicate_status">Send button indicates status</string>
     <string name="pref_use_indicate_received">Request message receipts</string>
-    <string name="pref_use_indicate_received_summary">Received masseges will be marked with a green tick. Be aware that this might no work in every case.</string>
+    <string name="pref_use_indicate_received_summary">Received messages will be marked with a green tick if supported</string>
     <string name="pref_use_send_button_to_indicate_status_summary">Colorize send button to indicate contact status</string>
     <string name="pref_expert_options_other">Other</string>
     <string name="pref_conference_name">Conference name</string>
@@ -265,5 +267,20 @@
     <string name="conference_banned">You are banned from this conference</string>
     <string name="conference_members_only">This conference is members only</string>
     <string name="conference_kicked">You have been kicked from this conference</string>
+    <string name="using_account">using account %s</string>
+    <string name="checking_image">Checking image on HTTP host</string>
+    <string name="image_file_deleted">The image file has been deleted</string>
+    <string name="not_connected_try_again">You are not connected. Try again later</string>
+    <string name="check_image_filesize">Check image file size</string>
+    <string name="message_options">Message options</string>
+    <string name="copy_text">Copy text</string>
+    <string name="share_image">Share image</string>
+    <string name="copy_original_url">Copy original URL</string>
+    <string name="send_again">Send again</string>
+    <string name="image_url">Image URL</string>
+    <string name="message_text">Message text</string>
+    <string name="url_copied_to_clipboard">URL copied to clipboard</string>
+    <string name="message_copied_to_clipboard">Message copied to clipboard</string>
+    <string name="image_transmission_failed">Image transmission failed</string>
 
-</resources>
+</resources>
\ No newline at end of file
diff --git a/res/values/styles.xml b/res/values/styles.xml
index a827fe36c..64bde7709 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -1,15 +1,4 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <style name="sectionHeader" parent="android:Widget.Holo.Light.TextView">
-        <item name="android:drawableBottom">@drawable/section_header</item>
-        <item name="android:drawablePadding">4dp</item>
-        <item name="android:layout_marginTop">8dp</item>
-        <item name="android:textSize">14sp</item>
-        <item name="android:textAllCaps">true</item>
-        <item name="android:textColor">@color/primarytext</item>
-        <item name="android:textStyle">bold</item>
-    </style>
-
     <style name="Divider">
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">1.5dp</item>
diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml
index eccc8baea..06ab7560e 100644
--- a/res/xml/preferences.xml
+++ b/res/xml/preferences.xml
@@ -51,6 +51,7 @@
             android:title="@string/pref_sound" />
 
         <CheckBoxPreference
+            android:defaultValue="true"
             android:dependency="show_notification"
             android:key="always_notify_in_conference"
             android:summary="@string/pref_conference_notifications_summary"
@@ -88,6 +89,11 @@
                     android:key="dont_save_encrypted"
                     android:summary="@string/pref_dont_save_encrypted_summary"
                     android:title="@string/pref_dont_save_encrypted" />
+                <CheckBoxPreference
+                    android:defaultValue="false"
+                    android:key="enable_legacy_ssl"
+                    android:summary="@string/pref_enable_legacy_ssl_summary"
+                    android:title="@string/pref_enable_legacy_ssl" />
             </PreferenceCategory>
             <PreferenceCategory android:title="@string/pref_expert_options_other" >
                 <CheckBoxPreference
@@ -105,4 +111,4 @@
             android:title="@string/pref_never_send_crash" />
     </PreferenceCategory>
 
-</PreferenceScreen>
\ No newline at end of file
+</PreferenceScreen>