bump version

Update messenger-backend submodule.
#152 autodiscover unknown mimetypes.
2026-07-03 14:05:24 +02:00 · 2018-12-04 15:26:19 +01:00 · 2018-12-04 15:11:22 +01:00 · 2018-12-04 12:30:18 +01:00 · 2018-12-04 01:11:03 +01:00 · 2018-12-04 01:00:29 +01:00
570 changed files with 6505 additions and 46708 deletions
@@ -1,48 +1,24 @@
 <!--
-Please read the guidelines linked above, especially when you are a first time contributor. Remove this text and provide some basic informations below, if applicable. Remove template content which is not applicable.
-
-This is a bug report forum, if you like to discuss a new feature or submit suggestions, please use the community forum at https://support.delta.chat
+Please fill in as much as you can below (leaving out if not applicable is ok). This is a bug report and feature-tracking forum, if you like to discuss a new feature, please use the community forum at https://support.delta.chat. 
 -->

-**Delta Chat version**
-
-<!-- See settings dialog … -->
-
-**Expected behavior**
-
-<!-- What is the expected output? -->
-
-**Actual behavior**
-
-<!-- What do you see instead? -->
-
-**Steps to reproduce the problem**
-
-1. …
-2. …
-
-**Screen snapshots**
-
-<!-- If applicable … -->
-
-**Debug logs**
-<details>
-<summary>Logs</summary>
-
-```
+- Platform (android/blackberry/anbox):
+- Device:
+- Delta Chat Version:
+- Expected behavior:
+- Actual behavior:
+- Steps to reproduce the problem:
+- Screenshots:
+- Logs:

 <!--
-If applicable, debug logs can be copied from within the Delta Chat app: 
-
-Open the _Settings_ menu -> _About_ -> _version number|Info_.
+Debug logs can be copied from within the Delta Chat app with
+Settings menu -> Advanced -> Debug log

 Alternatively from the Android system log:
+`adb logcat -v time -s DeltaChat`

-` adb logcat -v time -s DeltaChat `
-
-This log contains private data (e.g. mail address, provider information) which shall be removed or anonymised prior to posting.
+Logs may contain private data 
+which shall be removed or anonymised prior to posting.
 -->

-```
-</details>
-
@@ -27,3 +27,9 @@ jni/libspeex/.deps/

 # ignore private scripts and directories, eg. local2github.prv.sh
 *.prv*
+
+# contains files for ndk-build when done from gradle.
+.externalNativeBuild
+
+# no vi tmp files
+*.swp
@@ -15,67 +15,22 @@
    <uses-feature android:name="android.hardware.portrait" android:required="false"/>
    <uses-feature android:name="android.hardware.touchscreen" android:required="false"/>

-    <uses-permission android:name="android.permission.USE_FINGERPRINT"/>
-    <uses-permission android:name="org.thoughtcrime.securesms.ACCESS_SECRETS"/>
-    <uses-permission android:name="android.permission.READ_PROFILE"/>
-    <uses-permission android:name="android.permission.WRITE_PROFILE"/>
-    <uses-permission android:name="android.permission.BROADCAST_WAP_PUSH"
-                     tools:ignore="ProtectedPermissions"/>
    <uses-permission android:name="android.permission.READ_CONTACTS"/>
-    <uses-permission android:name="android.permission.WRITE_CONTACTS"/>
-
    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-    <uses-permission android:name="android.permission.READ_CALL_LOG" />
-
    <uses-permission android:name="android.permission.CAMERA" />
-
    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
-
    <uses-permission android:name="android.permission.RECORD_AUDIO" />
    <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
-    <uses-permission android:name="android.permission.PROCESS_OUTGOING_CALLS" />
-    <uses-permission android:name="android.permission.READ_CALL_STATE"/>
-
-    <!-- For sending/receiving events -->
-    <uses-permission android:name="android.permission.WRITE_CALENDAR"/>
-    <uses-permission android:name="android.permission.READ_CALENDAR"/>
-
-
-    <!-- Normal -->
    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
    <uses-permission android:name="android.permission.VIBRATE"/>
    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-    <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" />
    <uses-permission android:name="android.permission.WAKE_LOCK" />
    <uses-permission android:name="android.permission.INTERNET" />
-
-    <uses-permission android:name="android.permission.GET_ACCOUNTS" />
-    <uses-permission android:name="com.google.android.c2dm.permission.RECEIVE" />
-
-    <!-- So we can add a TextSecure 'Account' -->
-    <uses-permission android:name="android.permission.READ_SYNC_SETTINGS" />
-    <uses-permission android:name="android.permission.WRITE_SYNC_SETTINGS" />
-    <uses-permission android:name="android.permission.AUTHENTICATE_ACCOUNTS" />
-    <uses-permission android:name="android.permission.USE_CREDENTIALS"/>
-
-    <!-- For conversation 'shortcuts' on the desktop -->
    <uses-permission android:name="android.permission.INSTALL_SHORTCUT"/>
-
-    <!-- For fixing MMS -->
    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
-    <uses-permission android:name="android.permission.CHANGE_WIFI_STATE"/>
-
-    <!-- Set image as wallpaper -->
    <uses-permission android:name="android.permission.SET_WALLPAPER"/>
-
-    <uses-permission android:name="android.permission.BLUETOOTH" />
-    <uses-permission android:name="android.permission.BROADCAST_STICKY" />
-
-    <uses-permission android:name="android.permission.CALL_PHONE" />
-    <uses-permission android:name="android.permission.DISABLE_KEYGUARD" />
    <uses-permission android:name="android.permission.RAISED_THREAD_PRIORITY" />
-    <uses-permission android:name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS"/>

    <application android:name=".ApplicationContext"
                 android:icon="@mipmap/ic_launcher_dev"
@@ -84,7 +39,8 @@
                 tools:replace="android:allowBackup"
                 android:allowBackup="false"
                 android:theme="@style/TextSecure.LightTheme"
-                 android:largeHeap="true">
+                 android:largeHeap="true"
+                 tools:ignore="GoogleAppIndexingWarning">

    <meta-data
            android:name="com.google.android.geo.API_KEY"
@@ -96,12 +52,6 @@
    <meta-data android:name="com.google.android.gms.car.application"
               android:resource="@xml/automotive_app_desc" />

-    <activity android:name="org.thoughtcrime.securesms.WebRtcCallActivity"
-              android:excludeFromRecents="true"
-              android:screenOrientation="portrait"
-              android:configChanges="mcc|mnc|locale|touchscreen|keyboard|keyboardHidden|navigation|orientation|screenLayout|screenSize|fontScale"
-              android:launchMode="singleTask"/>
-
    <activity android:name=".InviteActivity"
              android:theme="@style/TextSecure.HighlightTheme"
              android:windowSoftInputMode="stateHidden"
@@ -192,26 +142,8 @@
              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize" />

    <activity android:name=".GroupCreateActivity"
-          android:windowSoftInputMode="stateVisible"
          android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>

-    <activity android:name=".DatabaseUpgradeActivity"
-              android:theme="@style/NoAnimation.Theme.AppCompat.Light.DarkActionBar"
-              android:launchMode="singleTask"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
-
-    <activity android:name=".PassphraseCreateActivity"
-              android:label="@string/AndroidManifest__create_passphrase"
-              android:windowSoftInputMode="stateUnchanged"
-              android:theme="@style/TextSecure.LightNoActionBar"
-              android:launchMode="singleTask"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
-
-    <activity android:name=".PassphrasePromptActivity"
-              android:launchMode="singleTask"
-              android:theme="@style/TextSecure.LightIntroTheme"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
-
    <activity android:name=".NewConversationActivity"
              android:theme="@style/TextSecure.LightNoActionBar"
              android:windowSoftInputMode="stateAlwaysVisible"
@@ -222,18 +154,6 @@
          android:windowSoftInputMode="stateHidden"
          android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>

-    <activity android:name=".giph.ui.GiphyActivity"
-              android:theme="@style/TextSecure.LightNoActionBar"
-              android:windowSoftInputMode="stateHidden"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
-
-    <activity android:name=".PassphraseChangeActivity"
-              android:label="@string/AndroidManifest__change_passphrase"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
-
-    <activity android:name=".VerifyIdentityActivity"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
-
    <activity android:name=".ApplicationPreferencesActivity"
              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>

@@ -300,6 +220,14 @@
              android:windowSoftInputMode="stateVisible"
              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>

+    <activity android:name=".QrScanActivity"
+              android:theme="@style/TextSecure.LightTheme"
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
+
+    <activity android:name=".QrShowActivity"
+              android:theme="@style/TextSecure.LightTheme"
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
+
    <activity android:name=".ClearProfileAvatarActivity"
              android:theme="@style/Theme.AppCompat.Dialog.Alert"
              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
@@ -312,36 +240,11 @@
        </intent-filter>
    </activity>

-    <activity android:name=".contactshare.ContactShareEditActivity"
+    <activity android:name=".preferences.ChatBackgroundActivity"
              android:theme="@style/TextSecure.LightTheme"
              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>

-    <activity android:name=".contactshare.ContactNameEditActivity"
-              android:theme="@style/TextSecure.LightNoActionBar"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
-
-    <activity android:name=".contactshare.SharedContactDetailsActivity"
-              android:theme="@style/TextSecure.LightNoActionBar"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
-
-    <service android:enabled="true" android:name="org.thoughtcrime.securesms.service.WebRtcCallService"/>
-    <service android:enabled="true" android:exported="false" android:name=".service.KeyCachingService"/>
-    <service android:enabled="true" android:name=".service.MessageRetrievalService"/>
-
-    <service android:name=".service.AccountAuthenticatorService" android:exported="true">
-        <intent-filter>
-            <action android:name="android.accounts.AccountAuthenticator" />
-        </intent-filter>
-        <meta-data android:name="android.accounts.AccountAuthenticator" android:resource="@xml/authenticator" />
-    </service>
-
-    <service android:name=".service.ContactsSyncAdapterService" android:exported="true">
-        <intent-filter>
-            <action android:name="android.content.SyncAdapter"/>
-        </intent-filter>
-        <meta-data android:name="android.content.SyncAdapter" android:resource="@xml/syncadapter" />
-        <meta-data android:name="android.provider.CONTACTS_STRUCTURE" android:resource="@xml/contactsformat" />
-    </service>
+    <service android:name=".connect.KeepAliveService" android:enabled="true"/>

    <service android:name=".service.DirectShareService"
             android:permission="android.permission.BIND_CHOOSER_TARGET_SERVICE">
@@ -350,14 +253,7 @@
        </intent-filter>
    </service>

-    <service android:name=".service.GenericForegroundService"/>
-
-    <receiver android:name=".gcm.GcmBroadcastReceiver" android:permission="com.google.android.c2dm.permission.SEND" >
-        <intent-filter>
-            <action android:name="com.google.android.c2dm.intent.RECEIVE" />
-            <category android:name="org.thoughtcrime.securesms" />
-        </intent-filter>
-    </receiver>
+    <receiver android:name=".connect.TimerReceiver" android:enabled="true"/>

    <receiver android:name=".notifications.MarkReadReceiver"
              android:enabled="true"
@@ -389,20 +285,11 @@
        </intent-filter>
    </receiver>

-    <receiver android:name=".service.ExpirationListener" />
-
-    <receiver android:name=".jobmanager.requirements.BackoffReceiver" />
-
    <provider android:name=".providers.PartProvider"
              android:grantUriPermissions="true"
              android:exported="false"
              android:authorities="${applicationId}.provider.securesms" />

-    <provider android:name=".providers.MmsBodyProvider"
-              android:grantUriPermissions="true"
-              android:exported="false"
-              android:authorities="${applicationId}.provider.securesms.mms" />
-
    <provider android:name="android.support.v4.content.FileProvider"
              android:authorities="${applicationId}.fileprovider"
              android:exported="false"
@@ -426,24 +313,6 @@
        </intent-filter>
    </receiver>

-    <receiver android:name=".service.DirectoryRefreshListener">
-        <intent-filter>
-            <action android:name="android.intent.action.BOOT_COMPLETED" />
-        </intent-filter>
-    </receiver>
-
-    <receiver android:name=".service.RotateSignedPreKeyListener">
-        <intent-filter>
-            <action android:name="android.intent.action.BOOT_COMPLETED" />
-        </intent-filter>
-    </receiver>
-
-        <receiver android:name=".service.PersistentConnectionBootListener">
-        <intent-filter>
-            <action android:name="android.intent.action.BOOT_COMPLETED"/>
-        </intent-filter>
-    </receiver>
-
    <receiver android:name=".notifications.MessageNotifier$ReminderReceiver">
        <intent-filter>
            <action android:name="org.thoughtcrime.securesms.MessageNotifier.REMINDER_ACTION"/>
@@ -1,74 +0,0 @@
-Building Signal
-===============
-
-Basics
------
-
-Signal uses [Gradle](http://gradle.org) to build the project and to maintain
-dependencies.  However, you needn't install it yourself; the
-"gradle wrapper" `gradlew`, mentioned below, will do that for you.
-
-Building Signal
---------------
-
-The following steps should help you (re)build Signal from the command line.
-
-1. Checkout the Signal-Android project source with the command:
-
-        git clone https://github.com/signalapp/Signal-Android.git
-
-2. Make sure you have the [Android SDK](https://developer.android.com/sdk/index.html) installed.
-3. Ensure that the following packages are installed from the Android SDK manager:
-    * Android SDK Build Tools (see buildToolsVersion in build.gradle)
-    * SDK Platform (All API levels)
-    * Android Support Repository
-    * Google Repository
-4. Create a local.properties file at the root of your source checkout and add an sdk.dir entry to it.  For example:
-
-        sdk.dir=/Application/android-sdk-macosx
-
-5. Using Java 8 
-
-6. Execute Gradle:
-
-        ./gradlew build
-
-Visual assets
----------------------
-
-Source assets tend to be large binary blobs, which are best stored outside of git repositories. Some source files are SVGs that can be auto-colored and sized using a tool like [android-res-utils](https://github.com/sebkur/android-res-utils).
-
-Sample command for generating our audio placeholder image:
-
-```bash
-pngs_from_svg.py ic_audio.svg /path/to/Signal/res/ 150 --color #000 --opacity 0.54 --suffix _light
-pngs_from_svg.py ic_audio.svg /path/to/Signal/res/ 150 --color #fff --opacity 1.00 --suffix _light
-```
-
-Setting up a development environment
------------------------------------
-
-[Android Studio](https://developer.android.com/sdk/installing/studio.html) is the recommended development environment.
-
-1. Install Android Studio.
-2. Open Android Studio. On a new installation, the Quickstart panel will appear. If you have open projects, close them using "File > Close Project" to see the Quickstart panel.
-3. From the Quickstart panel, choose "Configure" then "SDK Manager".
-4. In the SDK Tools tab of the SDK Manager, make sure that the "Android Support Repository" is installed, and that the latest "Android SDK build-tools" are installed. Click "OK" to return to the Quickstart panel.
-5. From the Quickstart panel, choose "Checkout from Version Control" then "git".
-6. Paste the URL for the Signal-Android project when prompted (https://github.com/signalapp/Signal-Android.git).
-7. Android studio should detect the presence of a project file and ask you whether to open it. Click "yes".
-9. Default config options should be good enough.
-9. Project initialisation and build should proceed.
-
-Contributing code
-----------------
-
-Code contributions should be sent via github as pull requests, from feature branches [as explained here](https://help.github.com/articles/using-pull-requests).
-
-Mailing list
------------
-
-Development discussion happens on the whispersystems mailing list.
-[To join](https://lists.riseup.net/www/info/whispersystems)
-Send emails to whispersystems@lists.riseup.net
-
@@ -1,34 +0,0 @@
-TextSecure provides encrypted text messages for Android.
-Copyright 2011 Whisper Systems
-
-This software has the follow third party dependencies:
-
-Bouncy Castle 1.42
-http://www.bouncycastle.org/
-MIT License
-
-Copyright (c) 2000 - 2011 The Legion Of The Bouncy Castle (http://www.bouncycastle.org)
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-ZXing
-http://code.google.com/p/zxing/
-Apache License 2.0
-
-Copyright 2009 ZXing authors
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
@@ -14,7 +14,7 @@ For ready-to-use binaries, please go to https://delta.chat .
 When checking out _deltachat-android-ii_, make sure also to check out the
 subproject _deltachat-core_:

- When using Git, you can can do this initially by
+- When using Git, you can do this initially by
  `$ git clone --recursive https://github.com/deltachat/deltachat-android-ii`
  or later by `git submodule update --init --recursive`. If you do this in your
  home directory, this results in the folder `~/deltachat-android-ii` which is just fine.
@@ -1,2 +0,0 @@
-*.db
-*.db.gz
@@ -1,106 +0,0 @@
-import sys
-import re
-import argparse
-import sqlite3
-import gzip
-from progressbar import ProgressBar, Counter, Timer
-from lxml import etree
-
-parser = argparse.ArgumentParser(prog='apntool', description="""Process Android's apn xml files and drop them into an
-                                                             easily queryable SQLite db. Tested up to version 9 of
-                                                             their APN file.""")
-parser.add_argument('-v', '--version', action='version', version='%(prog)s v1.1')
-parser.add_argument('-i', '--input', help='the xml file to parse', default='apns.xml', required=False)
-parser.add_argument('-o', '--output', help='the sqlite db output file', default='apns.db', required=False)
-parser.add_argument('--quiet', help='do not show progress or verbose instructions', action='store_true', required=False)
-parser.add_argument('--no-gzip', help="do not gzip after creation", action='store_true', required=False)
-args = parser.parse_args()
-
-
-def normalized(target):
-    o2_typo = re.compile(r"02\.co\.uk")
-    port_typo = re.compile(r"(\d+\.\d+\.\d+\.\d+)\.(\d+)")
-    leading_zeros = re.compile(r"(/|\.|^)0+(\d+)")
-    subbed = o2_typo.sub(r'o2.co.uk', target)
-    subbed = port_typo.sub(r'\1:\2', subbed)
-    subbed = leading_zeros.sub(r'\1\2', subbed)
-    return subbed
-
-try:
-    connection = sqlite3.connect(args.output)
-    cursor = connection.cursor()
-    cursor.execute('SELECT SQLITE_VERSION()')
-    version = cursor.fetchone()
-    if not args.quiet:
-        print("SQLite version: %s" % version)
-        print("Opening %s" % args.input)
-
-    cursor.execute("PRAGMA legacy_file_format=ON")
-    cursor.execute("PRAGMA journal_mode=DELETE")
-    cursor.execute("PRAGMA page_size=32768")
-    cursor.execute("VACUUM")
-    cursor.execute("DROP TABLE IF EXISTS apns")
-    cursor.execute("""CREATE TABLE apns(_id INTEGER PRIMARY KEY, mccmnc TEXT, mcc TEXT, mnc TEXT, carrier TEXT,
-                apn TEXT, mmsc TEXT, port INTEGER, type TEXT, protocol TEXT, bearer TEXT, roaming_protocol TEXT,
-                carrier_enabled INTEGER, mmsproxy TEXT, mmsport INTEGER, proxy TEXT,  mvno_match_data TEXT,
-                mvno_type TEXT, authtype INTEGER, user TEXT, password TEXT, server TEXT)""")
-
-    apns = etree.parse(args.input)
-    root = apns.getroot()
-    pbar = None
-    if not args.quiet:
-        pbar = ProgressBar(widgets=['Processed: ', Counter(), ' apns (', Timer(), ')'], maxval=len(list(root))).start()
-
-    count = 0
-    for apn in root.iter("apn"):
-        if apn.get("mmsc") is None:
-            continue
-        sqlvars = ["?" for x in apn.attrib.keys()] + ["?"]
-        mccmnc = "%s%s" % (apn.get("mcc"), apn.get("mnc"))
-        normalized_mmsc = normalized(apn.get("mmsc"))
-        if normalized_mmsc != apn.get("mmsc"):
-            print("normalize MMSC: %s => %s" % (apn.get("mmsc"), normalized_mmsc))
-            apn.set("mmsc", normalized_mmsc)
-
-        if not apn.get("mmsproxy") is None:
-            normalized_mmsproxy = normalized(apn.get("mmsproxy"))
-            if normalized_mmsproxy != apn.get("mmsproxy"):
-                print("normalize proxy: %s => %s" % (apn.get("mmsproxy"), normalized_mmsproxy))
-                apn.set("mmsproxy", normalized_mmsproxy)
-
-        values = [apn.get(attrib) for attrib in apn.attrib.keys()] + [mccmnc]
-        keys = apn.attrib.keys() + ["mccmnc"]
-
-        cursor.execute("SELECT 1 FROM apns WHERE mccmnc = ? AND apn = ?", [mccmnc, apn.get("apn")])
-        if cursor.fetchone() is None:
-            statement = "INSERT INTO apns (%s) VALUES (%s)" % (", ".join(keys), ", ".join(sqlvars))
-            cursor.execute(statement, values)
-
-        count += 1
-        if not args.quiet:
-            pbar.update(count)
-
-    if not args.quiet:
-        pbar.finish()
-    connection.commit()
-    print("Successfully written to %s" % args.output)
-
-    if not args.no_gzip:
-        gzipped_file = "%s.gz" % (args.output,)
-        with open(args.output, 'rb') as orig:
-            with gzip.open(gzipped_file, 'wb') as gzipped:
-                gzipped.writelines(orig)
-        print("Successfully gzipped to %s" % gzipped_file)
-
-    if not args.quiet:
-        print("\nTo include this in the distribution, copy it to the project's assets/databases/ directory.")
-        print("If you support API 10 or lower, you must use the gzipped version to avoid corruption.")
-
-except sqlite3.Error, e:
-    if connection:
-        connection.rollback()
-    print("Error: %s" % e.args[0])
-    sys.exit(1)
-finally:
-    if connection:
-        connection.close()
@@ -1,3 +0,0 @@
-argparse>=1.2.1
-lxml>=3.3.3
-progressbar-latest>=2.4
@@ -83,6 +83,8 @@ dependencies {
    compile 'org.whispersystems:signal-service-android:2.7.6'
    compile 'org.whispersystems:webrtc-android:M68'

+    compile 'com.journeyapps:zxing-android-embedded:3.4.0'
+
    compile "me.leolin:ShortcutBadger:1.1.16"
    compile 'se.emilsjolander:stickylistheaders:2.7.0'
    compile 'com.jpardogo.materialtabstrip:library:1.0.9'
@@ -92,11 +94,8 @@ dependencies {
    annotationProcessor 'com.github.bumptech.glide:compiler:4.5.0'
    compile 'com.makeramen:roundedimageview:2.1.0'
    compile 'com.pnikosis:materialish-progress:1.5'
-    compile 'org.greenrobot:eventbus:3.0.0'
-    compile 'pl.tajchert:waitingdots:0.1.0'
    compile 'com.soundcloud.android:android-crop:0.9.10@aar'
    compile 'com.melnykov:floatingactionbutton:1.3.0'
-    compile 'com.google.zxing:android-integration:3.1.0'
    compile 'com.squareup.dagger:dagger:1.2.2'
    annotationProcessor 'com.squareup.dagger:dagger-compiler:1.2.2'
    compile 'mobi.upod:time-duration-picker:1.1.3'
@@ -124,10 +123,6 @@ dependencies {
    compile 'com.codewaves.stickyheadergrid:stickyheadergrid:0.9.4'
    compile 'com.github.dmytrodanylyk.circular-progress-button:library:1.1.3-S2'
    compile 'org.signal:android-database-sqlcipher:3.5.9-S3'
-    compile ('com.googlecode.ez-vcard:ez-vcard:0.9.11') {
-        exclude group: 'com.fasterxml.jackson.core'
-        exclude group: 'org.freemarker'
-    }

    testCompile 'junit:junit:4.12'
    testCompile 'org.assertj:assertj-core:1.7.1'
@@ -156,7 +151,6 @@ dependencyVerification {
        'com.android.support:preference-v14:1fcf40bd560dc21ce55b6a292d1326d28f52dc5e4f2a64eef2f38dd95777b645',
        'com.android.support:preference-v7:d9f32ddc92f8d6a0bd86a18f4fcaff805fa021245e395b6e7dd382907443ee53',
        'com.pnikosis:materialish-progress:d71d80e00717a096784482aee21001a9d299fec3833e4ebd87739ed36cf77c54',
-        'pl.tajchert:waitingdots:2835d49e0787dbcb606c5a60021ced66578503b1e9fddcd7a5ef0cd5f095ba2c',
        'mobi.upod:time-duration-picker:db469ce0f48dd96b892eac424ed76870e54bf00fe0a28cdcddfbe5f2a226a0e1',
        'com.codewaves.stickyheadergrid:stickyheadergrid:5b4aa6a52a957cfd55f60f4220c11c0c371385a3cb9786cae03c260dcdef5794',
        'com.android.support:appcompat-v7:b2825e8b47f665d3362d8481c8d147d1af9230d16f23a2b94f6ccbc53c68cec1',
@@ -183,9 +177,7 @@ dependencyVerification {
        'com.github.chrisbanes:PhotoView:ed06775308da260e1fd86d1d3288988fcd3d80db24ce0d7c9fcfedc39e622292',
        'com.github.bumptech.glide:glide:997de7ac95be6c944d3b8cbe13de11307736ea45451c1b09a6cec7c328ead59f',
        'com.makeramen:roundedimageview:1f5a1865796b308c6cdd114acc6e78408b110f0a62fc63553278fbeacd489cd1',
-        'org.greenrobot:eventbus:180d4212467df06f2fbc9c8d8a2984533ac79c87769ad883bc421612f0b4e17c',
        'com.soundcloud.android:android-crop:ffd4b973cf6e97f7d64118a0dc088df50e9066fd5634fe6911dd0c0c5d346177',
-        'com.google.zxing:android-integration:89e56aadf1164bd71e57949163c53abf90af368b51669c0d4a47a163335f95c4',
        'com.squareup.dagger:dagger:789aca24537022e49f91fc6444078d9de8f1dd99e1bfb090f18491b186967883',
        'com.amulyakhare:com.amulyakhare.textdrawable:54c92b5fba38cfd316a07e5a30528068f45ce8515a6890f1297df4c401af5dcb',
        'com.google.zxing:core:b4d82452e7a6bf6ec2698904b332431717ed8f9a850224f295aec89de80f2259',
@@ -197,7 +189,6 @@ dependencyVerification {
        'com.takisoft.fix:colorpicker:f5d0dbabe406a1800498ca9c1faf34db36e021d8488bf10360f29961fe3ab0d1',
        'com.github.dmytrodanylyk.circular-progress-button:library:8dc6a29a5a8db7b2ad5a9a7fda1dc9ae0893f4c8f0545732b2c63854ea693e8e',
        'org.signal:android-database-sqlcipher:33d4063336893af00b9d68b418e7b290cace74c20ce8aacffddc0911010d3d73',
-        'com.googlecode.ez-vcard:ez-vcard:7e24ad50b222d2f70ac91bdccfa3c0f6200b078d797cb784837f75e77bb4210f',
        'com.google.android.gms:play-services-iid:54e919f9957b8b7820da7ee9b83471d00d0cac1cf08ddea8b5b41aea80bb1a70',
        'com.google.android.gms:play-services-base:0ca636a8fc9a5af45e607cdcd61783bf5d561cbbb0f862021ce69606eee5ad49',
        'com.google.android.gms:play-services-tasks:69ec265168e601d0203d04cd42e34bb019b2f029aa1e16fabd38a5153eea2086',
@@ -225,10 +216,8 @@ dependencyVerification {
        'com.github.bumptech.glide:disklrucache:c1b1b6f5bbd01e2fcdc9d7f60913c8d338bdb65ed4a93bfa02b56f19daaade4b',
        'com.github.bumptech.glide:annotations:bede99ef9f71517a4274bac18fd3e483e9f2b6108d7d6fe8f4949be4aa4d9512',
        'com.nineoldandroids:library:68025a14e3e7673d6ad2f95e4b46d78d7d068343aa99256b686fe59de1b3163a',
-        'javax.inject:javax.inject:91c77044a50c481636c32d916fd89c9118a72195390452c81065080f957de7ff',
        'com.klinkerapps:logger:177e325259a8b111ad6745ec10db5861723c99f402222b80629f576f49408541',
        'com.google.android:flexbox:a9989fd13ae2ee42765dfc515fe362edf4f326e74925d02a10369df8092a4935',
-        'org.jsoup:jsoup:abeaf34795a4de70f72aed6de5966d2955ec7eb348eeb813324f23c999575473',
        'org.whispersystems:curve25519-android:82595394422b957d4a5b5f1b27b75ba25cf6dc4db4d312418ca38cd6fff279ca',
        'org.whispersystems:signal-protocol-java:5152c2b01a25147967d6bf82e540f947901bdfa79260be3eb3e96b03f787d6b5',
        'com.google.protobuf:protobuf-java:e0c1c64575c005601725e7c6a02cebf9e1285e888f756b2a1d73ffa8d725cc74',
@@ -255,8 +244,8 @@ android {
    }

    defaultConfig {
-        versionCode 392
-        versionName "0.0.1"
+        versionCode 400
+        versionName "0.0.10"
        applicationId "chat.delta.androidii"

        minSdkVersion 14
@@ -264,14 +253,12 @@ android {
        multiDexEnabled true

        vectorDrawables.useSupportLibrary = true
-        project.ext.set("archivesBaseName", "Signal");
+        project.ext.set("archivesBaseName", "Deltachat");

        buildConfigField "long", "BUILD_TIMESTAMP", getLastCommitTimestamp() + "L"
        buildConfigField "String", "SIGNAL_URL", "\"https://textsecure-service.whispersystems.org\""
        buildConfigField "String", "SIGNAL_CDN_URL", "\"https://cdn.signal.org\""
        buildConfigField "String", "SIGNAL_SERVICE_STATUS_URL", "\"uptime.signal.org\""
-        buildConfigField "String", "GIPHY_PROXY_HOST", "\"giphy-proxy-production.whispersystems.org\""
-        buildConfigField "int", "GIPHY_PROXY_PORT", "80"
        buildConfigField "String", "USER_AGENT", "\"OWA\""
        buildConfigField "boolean", "DEV_BUILD", "false"

@@ -320,7 +307,6 @@ android {
                          'proguard-klinker.pro',
                          'proguard-retrolambda.pro',
                          'proguard-okhttp.pro',
-                          'proguard-ez-vcard.pro',
                          'proguard.cfg'
            testProguardFiles 'proguard-automation.pro',
                          'proguard.cfg'
@@ -927,7 +927,6 @@ messenger-backend/src/dc_strbuilder.c \
 messenger-backend/src/dc_strencode.c \
 messenger-backend/src/dc_token.c \
 messenger-backend/src/dc_tools.c \
-messenger-backend/src/dc_uudecode.c \
 dc_wrapper.c

 include $(BUILD_SHARED_LIBRARY)
@@ -238,27 +238,27 @@ JNIEXPORT jint Java_com_b44t_messenger_DcContext_isConfigured(JNIEnv *env, jobje
 }


-JNIEXPORT void Java_com_b44t_messenger_DcContext_performJobs(JNIEnv *env, jobject obj)
+JNIEXPORT void Java_com_b44t_messenger_DcContext_performImapJobs(JNIEnv *env, jobject obj)
 {
 	dc_perform_imap_jobs(get_dc_context(env, obj));
 }


-JNIEXPORT void Java_com_b44t_messenger_DcContext_idle(JNIEnv *env, jobject obj)
+JNIEXPORT void Java_com_b44t_messenger_DcContext_performImapIdle(JNIEnv *env, jobject obj)
 {
 	dc_perform_imap_idle(get_dc_context(env, obj));
 }


-JNIEXPORT void Java_com_b44t_messenger_DcContext_interruptIdle(JNIEnv *env, jobject obj)
+JNIEXPORT void Java_com_b44t_messenger_DcContext_performImapFetch(JNIEnv *env, jobject obj)
 {
-	dc_interrupt_imap_idle(get_dc_context(env, obj));
+	dc_perform_imap_fetch(get_dc_context(env, obj));
 }


-JNIEXPORT void Java_com_b44t_messenger_DcContext_fetch(JNIEnv *env, jobject obj)
+JNIEXPORT void Java_com_b44t_messenger_DcContext_interruptImapIdle(JNIEnv *env, jobject obj)
 {
-	dc_perform_imap_fetch(get_dc_context(env, obj));
+	dc_interrupt_imap_idle(get_dc_context(env, obj));
 }


@@ -274,9 +274,9 @@ JNIEXPORT void Java_com_b44t_messenger_DcContext_performSmtpIdle(JNIEnv *env, jo
 }


-JNIEXPORT void Java_com_b44t_messenger_DcContext_interruptSmtpIdle(JNIEnv *env, jobject obj)
+JNIEXPORT void Java_com_b44t_messenger_DcContext_maybeNetwork(JNIEnv *env, jobject obj)
 {
-	dc_interrupt_smtp_idle(get_dc_context(env, obj));
+	dc_maybe_network(get_dc_context(env, obj));
 }


@@ -452,11 +452,15 @@ JNIEXPORT jint Java_com_b44t_messenger_DcContext_removeContactFromChat(JNIEnv *e
 }


-JNIEXPORT void Java_com_b44t_messenger_DcContext_setDraft(JNIEnv *env, jobject obj, jint chat_id, jstring draft /* NULL=delete */)
+JNIEXPORT void Java_com_b44t_messenger_DcContext_setDraft(JNIEnv *env, jobject obj, jint chat_id, jobject msg /* NULL=delete */)
 {
-	CHAR_REF(draft);
-		dc_set_text_draft(get_dc_context(env, obj), chat_id, draftPtr /* NULL=delete */);
-	CHAR_UNREF(draft);
+	dc_set_draft(get_dc_context(env, obj), chat_id, get_dc_msg(env, msg));
+}
+
+
+JNIEXPORT jlong Java_com_b44t_messenger_DcContext_getDraftCPtr(JNIEnv *env, jobject obj, jint chat_id)
+{
+	return (jlong)dc_get_draft(get_dc_context(env, obj), chat_id);
 }


@@ -547,34 +551,6 @@ JNIEXPORT jint Java_com_b44t_messenger_DcContext_sendTextMsg(JNIEnv *env, jobjec
 }


-JNIEXPORT jint Java_com_b44t_messenger_DcContext_sendVcardMsg(JNIEnv *env, jobject obj, jint chat_id, jint contact_id)
-{
-	return dc_send_vcard_msg(get_dc_context(env, obj), chat_id, contact_id);
-}
-
-
-JNIEXPORT jint Java_com_b44t_messenger_DcContext_sendMediaMsg(JNIEnv *env, jobject obj, jint chat_id, jint type, jstring file, jstring mime, jint w, jint h, jint ms, jstring author, jstring trackname)
-{
-	jint msg_id = 0;
-	CHAR_REF(file);
-	CHAR_REF(mime);
-	CHAR_REF(author);
-	CHAR_REF(trackname);
-	switch (type) {
-		case DC_MSG_IMAGE: msg_id = (jint)dc_send_image_msg(get_dc_context(env, obj), chat_id, filePtr, mimePtr, w, h); break;
-		case DC_MSG_VIDEO: msg_id = (jint)dc_send_video_msg(get_dc_context(env, obj), chat_id, filePtr, mimePtr, w, h, ms); break;
-		case DC_MSG_VOICE: msg_id = (jint)dc_send_voice_msg(get_dc_context(env, obj), chat_id, filePtr, mimePtr, ms); break;
-		case DC_MSG_AUDIO: msg_id = (jint)dc_send_audio_msg(get_dc_context(env, obj), chat_id, filePtr, mimePtr, ms, authorPtr, tracknamePtr); break;
-		default:           msg_id = (jint)dc_send_file_msg (get_dc_context(env, obj), chat_id, filePtr, mimePtr); break;
-	}
-	CHAR_UNREF(trackname);
-	CHAR_UNREF(author);
-	CHAR_UNREF(mime);
-	CHAR_UNREF(file);
-	return msg_id;
-}
-
-
 /* DcContext - handle config */

 JNIEXPORT void Java_com_b44t_messenger_DcContext_setConfig(JNIEnv *env, jobject obj, jstring key, jstring value /*may be NULL*/)
@@ -754,6 +730,12 @@ JNIEXPORT jlong Java_com_b44t_messenger_DcChatlist_getChatCPtr(JNIEnv *env, jobj
 }


+JNIEXPORT jint Java_com_b44t_messenger_DcChatlist_getMsgId(JNIEnv *env, jobject obj, jint index)
+{
+	return dc_chatlist_get_msg_id(get_dc_chatlist(env, obj), index);
+}
+
+
 JNIEXPORT jlong Java_com_b44t_messenger_DcChatlist_getMsgCPtr(JNIEnv *env, jobject obj, jint index)
 {
 	dc_chatlist_t* chatlist = get_dc_chatlist(env, obj);
@@ -856,21 +838,6 @@ JNIEXPORT jboolean Java_com_b44t_messenger_DcChat_isVerified(JNIEnv *env, jobjec
 }


-JNIEXPORT jstring Java_com_b44t_messenger_DcChat_getDraft(JNIEnv *env, jobject obj) /* returns NULL for "no draft" */
-{
-	const char* temp = dc_chat_get_text_draft(get_dc_chat(env, obj));
-		jstring ret = temp? JSTRING_NEW(temp) : NULL;
-	free(temp);
-	return ret;
-}
-
-
-JNIEXPORT jlong Java_com_b44t_messenger_DcChat_getDraftTimestamp(JNIEnv *env, jobject obj)
-{
-	return JTIMESTAMP(dc_chat_get_draft_timestamp(get_dc_chat(env, obj)));
-}
-
-
 JNIEXPORT jintArray Java_com_b44t_messenger_DcContext_getChatMedia(JNIEnv *env, jobject obj, jint chat_id, jint msg_type, jint or_msg_type)
 {
 	dc_array_t* ca = dc_get_chat_media(get_dc_context(env, obj), chat_id, msg_type, or_msg_type);
@@ -922,12 +889,14 @@ JNIEXPORT jintArray Java_com_b44t_messenger_DcContext_getChatContacts(JNIEnv *en
 static dc_msg_t* get_dc_msg(JNIEnv *env, jobject obj)
 {
 	static jfieldID fid = 0;
-	if (fid==0) {
-		jclass cls = (*env)->GetObjectClass(env, obj);
-		fid = (*env)->GetFieldID(env, cls, "msgCPtr", "J" /*Signature, J=long*/);
-	}
-	if (fid) {
-		return (dc_msg_t*)(*env)->GetLongField(env, obj, fid);
+	if (env && obj) {
+		if (fid==0) {
+			jclass cls = (*env)->GetObjectClass(env, obj);
+			fid = (*env)->GetFieldID(env, cls, "msgCPtr", "J" /*Signature, J=long*/);
+		}
+		if (fid) {
+			return (dc_msg_t*)(*env)->GetLongField(env, obj, fid);
+		}
 	}
 	return NULL;
 }
@@ -1010,9 +979,9 @@ JNIEXPORT void Java_com_b44t_messenger_DcMsg_lateFilingMediaSize(JNIEnv *env, jo
 }


-JNIEXPORT jint Java_com_b44t_messenger_DcMsg_getBytes(JNIEnv *env, jobject obj)
+JNIEXPORT jlong Java_com_b44t_messenger_DcMsg_getFilebytes(JNIEnv *env, jobject obj)
 {
-	return (jint)dc_msg_get_filebytes(get_dc_msg(env, obj));
+	return (jlong)dc_msg_get_filebytes(get_dc_msg(env, obj));
 }


@@ -1064,12 +1033,6 @@ JNIEXPORT jstring Java_com_b44t_messenger_DcMsg_getFilename(JNIEnv *env, jobject
 }


-JNIEXPORT jlong Java_com_b44t_messenger_DcMsg_getMediainfoCPtr(JNIEnv *env, jobject obj)
-{
-	return (jlong)dc_msg_get_mediainfo(get_dc_msg(env, obj));
-}
-
-
 JNIEXPORT jboolean Java_com_b44t_messenger_DcMsg_isForwarded(JNIEnv *env, jobject obj)
 {
    return dc_msg_is_forwarded(get_dc_msg(env, obj))!=0;
@@ -1133,16 +1096,6 @@ JNIEXPORT void Java_com_b44t_messenger_DcMsg_setDuration(JNIEnv *env, jobject ob
 }


-JNIEXPORT void Java_com_b44t_messenger_DcMsg_setMediainfo(JNIEnv *env, jobject obj, jstring author, jstring trackname)
-{
-	CHAR_REF(author);
-	CHAR_REF(trackname);
-		dc_msg_set_mediainfo(get_dc_msg(env, obj), authorPtr, tracknamePtr);
-	CHAR_UNREF(trackname);
-	CHAR_UNREF(author);
-}
-
-
 /*******************************************************************************
 * DcContact
 ******************************************************************************/
@@ -1219,6 +1172,15 @@ JNIEXPORT jstring Java_com_b44t_messenger_DcContact_getNameNAddr(JNIEnv *env, jo
 }


+JNIEXPORT jstring Java_com_b44t_messenger_DcContact_getProfileImage(JNIEnv *env, jobject obj)
+{
+	const char* temp = dc_contact_get_profile_image(get_dc_contact(env, obj));
+		jstring ret = JSTRING_NEW(temp);
+	free(temp);
+	return ret;
+}
+
+
 JNIEXPORT jboolean Java_com_b44t_messenger_DcContact_isBlocked(JNIEnv *env, jobject obj)
 {
 	return (jboolean)(dc_contact_is_blocked(get_dc_contact(env, obj))!=0);
@@ -1 +0,0 @@
-dontwarn ezvcard.io.html.HCardPage
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
+    android:src="@drawable/ic_help_white_24dp"
+    android:tint="?attr/pref_icon_tint"/>
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
+    android:src="@drawable/ic_mood_white_24dp"
+    android:tint="?attr/pref_icon_tint"/>
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="#8000" />
+    <padding
+        android:left="1dp"
+        android:right="1dp"
+        android:bottom="1dp"
+        android:top="1dp" />
+    <corners android:radius="8dp" />
+</shape>
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
-
-    <android.support.v7.widget.Toolbar
-        android:id="@+id/toolbar"
-        android:layout_width="match_parent"
-        android:layout_height="?attr/actionBarSize"
-        android:theme="?attr/actionBarStyle"
-        android:minHeight="?attr/actionBarSize"
-        android:background="?attr/colorPrimary"
-        android:elevation="4dp"/>
-
-    <ScrollView
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical"
-            android:padding="12dp">
-
-            <org.thoughtcrime.securesms.components.emoji.EmojiTextView
-                android:id="@+id/name_edit_display_name"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginBottom="12dp"
-                android:textSize="20sp"
-                tools:text="Peter Parker"/>
-
-            <org.thoughtcrime.securesms.components.emoji.EmojiEditText
-                android:id="@+id/name_edit_prefix"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:hint="@string/ContactNameEditActivity_prefix"/>
-
-            <org.thoughtcrime.securesms.components.emoji.EmojiEditText
-                android:id="@+id/name_edit_given_name"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:hint="@string/ContactNameEditActivity_given_name"/>
-
-            <org.thoughtcrime.securesms.components.emoji.EmojiEditText
-                android:id="@+id/name_edit_middle_name"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:hint="@string/ContactNameEditActivity_middle_name"/>
-
-            <org.thoughtcrime.securesms.components.emoji.EmojiEditText
-                android:id="@+id/name_edit_family_name"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:hint="@string/ContactNameEditActivity_family_name"/>
-
-            <org.thoughtcrime.securesms.components.emoji.EmojiEditText
-                android:id="@+id/name_edit_suffix"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:hint="@string/ContactNameEditActivity_suffix"/>
-
-        </LinearLayout>
-
-    </ScrollView>
-
-</LinearLayout>
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <android.support.v7.widget.RecyclerView
-        android:id="@+id/contact_share_edit_list"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:paddingBottom="80dp"
-        android:clipToPadding="false"/>
-
-    <android.support.design.widget.FloatingActionButton
-        android:id="@+id/contact_share_edit_send"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="end|bottom"
-        android:src="@drawable/ic_send_push_white_24dp"
-        android:layout_margin="@dimen/floating_action_button_margin"/>
-
-</FrameLayout>
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <com.journeyapps.barcodescanner.CompoundBarcodeView
+        android:id="@+id/zxing_barcode_scanner"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_alignParentBottom="true" />
+
+</RelativeLayout>
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <ImageView
+        android:id="@+id/qrImage"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1"
+        android:contentDescription="@string/qr_scan_activity__title" />
+
+    <TextView
+        android:id="@+id/qrShowHint"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="16dp"
+        android:layout_marginEnd="8dp"
+        android:layout_marginStart="8dp"
+        android:text=""
+        android:textAlignment="center"
+        android:textAppearance="@style/TextAppearance.AppCompat"
+        android:textSize="16sp" />
+
+</LinearLayout>
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/layout_container"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <ImageView
+        android:id="@+id/preview"
+        android:scaleType="centerCrop"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:layout_gravity="bottom">
+
+        <Button
+            android:id="@+id/set_default_button"
+            android:theme="@style/Button.Primary"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="0.5"
+            android:text="Set default" />
+
+        <Button
+            android:id="@+id/from_gallery_button"
+            android:theme="@style/Button.Primary"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="0.5"
+            android:text="From gallery" />
+    </LinearLayout>
+
+</FrameLayout>
@@ -1,159 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<android.support.design.widget.CoordinatorLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:id="@+id/root"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <android.support.design.widget.AppBarLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content">
-
-        <android.support.design.widget.CollapsingToolbarLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:background="?attr/shared_contact_details_header_background">
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="?attr/actionBarSize"
-                android:orientation="vertical"
-                android:gravity="center">
-
-                <ImageView
-                    android:id="@+id/contact_details_avatar"
-                    android:layout_width="125dp"
-                    android:layout_height="125dp"
-                    android:padding="8dp"
-                    android:transitionName="avatar"
-                    app:layout_collapseMode="parallax"
-                    app:layout_collapseParallaxMultiplier="0.7"/>
-
-                <org.thoughtcrime.securesms.components.emoji.EmojiTextView
-                    android:id="@+id/contact_details_name"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:transitionName="name"
-                    android:gravity="center"
-                    android:textSize="20sp"
-                    tools:text="Peter Parker"/>
-
-                <TextView
-                    android:id="@+id/contact_details_number"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:transitionName="number"
-                    android:layout_marginBottom="14dp"
-                    android:gravity="center"
-                    tools:text="(610) 555-5555"/>
-
-                <Button
-                    android:id="@+id/contact_details_add_button"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginBottom="10dp"
-                    android:layout_gravity="center"
-                    style="@style/Button.Primary"
-                    android:text="@string/SharedContactDetailsActivity_add_to_contacts" />
-
-                <FrameLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content">
-
-                    <Button
-                        android:id="@+id/contact_details_invite_button"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginBottom="10dp"
-                        android:layout_gravity="center"
-                        style="@style/Button.Borderless"
-                        android:text="@string/SharedContactDetailsActivity_invite_to_signal"
-                        android:visibility="gone"
-                        tools:visibility="gone"/>
-
-                    <LinearLayout
-                        android:id="@+id/contact_details_engage_container"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center"
-                        android:orientation="horizontal"
-                        style="?attr/buttonBarStyle"
-                        android:visibility="gone"
-                        tools:visibility="visible">
-
-                        <LinearLayout
-                            android:id="@+id/contact_details_message_button"
-                            android:layout_width="0dp"
-                            android:layout_height="wrap_content"
-                            android:layout_weight="1"
-                            android:orientation="vertical"
-                            android:gravity="center"
-                            android:padding="10dp">
-
-                            <ImageView
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:layout_marginBottom="6dp"
-                                android:tint="@color/signal_primary"
-                                android:src="@drawable/message_24dp"/>
-
-                            <TextView
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:text="@string/SharedContactDetailsActivity_signal_message"
-                                android:textColor="@color/signal_primary"/>
-
-                        </LinearLayout>
-
-                        <LinearLayout
-                            android:id="@+id/contact_details_call_button"
-                            android:layout_width="0dp"
-                            android:layout_height="wrap_content"
-                            android:layout_weight="1"
-                            android:orientation="vertical"
-                            android:gravity="center"
-                            android:padding="10dp">
-
-                            <ImageView
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:layout_marginBottom="6dp"
-                                android:tint="@color/signal_primary"
-                                android:src="@drawable/phone_24dp"/>
-
-                            <TextView
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:text="@string/SharedContactDetailsActivity_signal_call"
-                                android:textColor="@color/signal_primary"/>
-
-                        </LinearLayout>
-
-                    </LinearLayout>
-
-                </FrameLayout>
-
-            </LinearLayout>
-
-            <android.support.v7.widget.Toolbar
-                android:id="@+id/toolbar"
-                android:layout_width="match_parent"
-                android:layout_height="?attr/actionBarSize"
-                android:theme="@style/TextSecure.LightActionBar.DarkText"
-                android:background="@color/transparent"
-                app:layout_collapseMode="pin" />
-
-        </android.support.design.widget.CollapsingToolbarLayout>
-
-    </android.support.design.widget.AppBarLayout>
-
-    <android.support.v7.widget.RecyclerView
-        android:id="@+id/contact_details_fields"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        app:layout_behavior="@string/appbar_scrolling_view_behavior"/>
-
-</android.support.design.widget.CoordinatorLayout>
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<merge xmlns:android="http://schemas.android.com/apk/res/android"
-       xmlns:tools="http://schemas.android.com/tools">
-
-    <ImageView
-        android:id="@+id/sms_failed_indicator"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:src="@drawable/ic_error"
-        android:visibility="gone"
-        android:tint="@color/core_red"
-        tools:visibility="visible"
-        android:contentDescription="@string/conversation_item_sent__send_failed_indicator_description" />
-
-    <ImageView
-        android:id="@+id/pending_approval_indicator"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:src="@drawable/ic_error"
-        android:tint="@color/core_light_60"
-        android:visibility="gone"
-        tools:visibility="visible"
-        android:layout_gravity="center_vertical"
-        android:contentDescription="@string/conversation_item_sent__pending_approval_description" />
-
-</merge>
@@ -100,24 +100,27 @@

            <LinearLayout android:layout_width="match_parent"
                          android:layout_height="wrap_content"
+                          android:layout_weight="1"
+                          android:visibility="invisible"
                          android:gravity="center"
-                          android:orientation="vertical"
-                          android:layout_weight="1">
+                          android:orientation="vertical">

                <org.thoughtcrime.securesms.components.CircleColorImageView
-                        android:id="@+id/contact_button"
+                        android:id="@+id/gif_button"
                        android:layout_width="53dp"
                        android:layout_height="53dp"
-                        android:src="@drawable/ic_person_white_24dp"
+                        android:src="@drawable/ic_gif_white_24dp"
+                        android:visibility="gone"
                        android:scaleType="center"
-                        android:contentDescription="@string/attachment_type_selector__contact_description"
-                        app:circleColor="@color/blue_400"/>
+                        android:contentDescription="@string/attachment_type_selector__gif_description"
+                        app:circleColor="@color/cyan_400"/>

                <TextView android:layout_marginTop="10dp"
+                          android:visibility="gone"
                          android:layout_width="wrap_content"
                          android:layout_height="wrap_content"
                          style="@style/AttachmentTypeLabel"
-                          android:text="@string/attachment_type_selector__contact"/>
+                          android:text="@string/attachment_type_selector__gif"/>

            </LinearLayout>

@@ -180,27 +183,26 @@

            </LinearLayout>

-
            <LinearLayout android:layout_width="match_parent"
                          android:layout_height="wrap_content"
-                          android:layout_weight="1"
                          android:gravity="center"
-                          android:orientation="vertical">
+                          android:orientation="vertical"
+                          android:layout_weight="1">

                <org.thoughtcrime.securesms.components.CircleColorImageView
-                        android:id="@+id/giphy_button"
+                        android:id="@+id/contact_button"
                        android:layout_width="53dp"
                        android:layout_height="53dp"
-                        android:src="@drawable/ic_gif_white_24dp"
+                        android:src="@drawable/ic_person_white_24dp"
                        android:scaleType="center"
-                        android:contentDescription="@string/attachment_type_selector__gif_description"
-                        app:circleColor="@color/cyan_400"/>
+                        android:contentDescription="@string/attachment_type_selector__contact_description"
+                        app:circleColor="@color/blue_400"/>

                <TextView android:layout_marginTop="10dp"
                          android:layout_width="wrap_content"
                          android:layout_height="wrap_content"
                          style="@style/AttachmentTypeLabel"
-                          android:text="@string/attachment_type_selector__gif"/>
+                          android:text="@string/attachment_type_selector__contact"/>

            </LinearLayout>

@@ -45,16 +45,6 @@
                           android:scaleType="centerInside"
                           android:contentDescription="@string/audio_view__pause_accessibility_description"/>

-                <ImageView android:id="@+id/download"
-                           android:layout_width="wrap_content"
-                           android:layout_height="wrap_content"
-                           android:layout_gravity="center_vertical"
-                           android:clickable="true"
-                           android:visibility="gone"
-                           android:background="@drawable/circle_touch_highlight_background"
-                           android:src="@drawable/ic_download_circle_fill_white_48dp"
-                           android:contentDescription="@string/audio_view__download_accessibility_description"/>
-
            </org.thoughtcrime.securesms.components.AnimatingToggle>

            <SeekBar android:id="@+id/seek"
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<org.thoughtcrime.securesms.preferences.BlockedContactListItem
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        android:layout_width="match_parent"
-        android:layout_height="?android:attr/listPreferredItemHeight"
-        android:paddingRight="25dip">
-
-    <org.thoughtcrime.securesms.components.AvatarImageView
-            android:id="@+id/contact_photo_image"
-            android:layout_width="@dimen/contact_selection_photo_size"
-            android:layout_height="@dimen/contact_selection_photo_size"
-            android:layout_alignParentLeft="true"
-            android:layout_centerVertical="true"
-            android:layout_marginLeft="10dp"
-            android:cropToPadding="true"
-            android:scaleType="centerCrop"
-            android:contentDescription="@string/SingleContactSelectionActivity_contact_photo" />
-
-    <TextView android:id="@+id/name"
-              android:layout_width="match_parent"
-              android:layout_height="match_parent"
-              android:layout_alignParentTop="true"
-              android:layout_marginLeft="14dip"
-              android:checkMark="?android:attr/listChoiceIndicatorMultiple"
-              android:singleLine="true"
-              android:ellipsize="marquee"
-              android:layout_toRightOf="@id/contact_photo_image"
-              android:gravity="center_vertical|left"
-              android:textAppearance="?android:attr/textAppearanceMedium" />
-
-</org.thoughtcrime.securesms.preferences.BlockedContactListItem>
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              android:layout_width="match_parent"
-              android:layout_height="match_parent"
-              android:orientation="vertical"
-              android:paddingLeft="16dip"
-              android:paddingRight="16dip">
-
-    <ListView android:id="@id/android:list"
-              android:layout_width="match_parent"
-              android:layout_height="match_parent"
-              android:layout_weight="1"
-              android:drawSelectorOnTop="false"/>
-
-    <TextView android:id="@id/android:empty"
-              android:layout_width="match_parent"
-              android:layout_height="match_parent"
-              android:layout_gravity="center|center_vertical"
-              android:gravity="center|center_vertical"
-              android:textSize="20sp"
-              android:text="@string/blocked_contacts_fragment__no_blocked_contacts"/>
-
-</LinearLayout>
@@ -32,15 +32,16 @@
                  android:orientation="vertical">

        <org.thoughtcrime.securesms.components.emoji.EmojiTextView
-                android:id="@+id/name"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:checkMark="?android:attr/listChoiceIndicatorMultiple"
-                android:singleLine="true"
-                android:ellipsize="marquee"
-                android:textAppearance="?android:attr/textAppearanceMedium"
-                android:textSize="16sp"
-                tools:text="Frieeeeeeedrich Nieeeeeeeeeetzsche" />
+            android:id="@+id/name"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:checkMark="?android:attr/listChoiceIndicatorMultiple"
+            android:drawablePadding="5dp"
+            android:ellipsize="marquee"
+            android:singleLine="true"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:textSize="16sp"
+            tools:text="Frieeeeeeedrich Nieeeeeeeeeetzsche" />

        <LinearLayout android:id="@+id/number_container"
                      android:orientation="horizontal"
@@ -1,98 +1,81 @@
 <?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_height="match_parent" android:layout_width="match_parent">
+    <org.thoughtcrime.securesms.components.InputAwareLayout
+            xmlns:android="http://schemas.android.com/apk/res/android"
+            xmlns:app="http://schemas.android.com/apk/res-auto"
+            xmlns:tools="http://schemas.android.com/tools"
+            android:id="@+id/layout_container"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">

-<org.thoughtcrime.securesms.components.InputAwareLayout
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:app="http://schemas.android.com/apk/res-auto"
-        xmlns:tools="http://schemas.android.com/tools"
-        android:id="@+id/layout_container"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
+    <org.thoughtcrime.securesms.components.camera.QuickAttachmentDrawer
+            android:id="@+id/quick_attachment_drawer"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:orientation="vertical">

-<org.thoughtcrime.securesms.components.camera.QuickAttachmentDrawer
-        android:id="@+id/quick_attachment_drawer"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical">
+        <LinearLayout android:id="@+id/conversation_container"
+                      android:layout_width="match_parent"
+                      android:layout_height="match_parent"
+                      android:orientation="vertical"
+                      android:paddingTop="?attr/actionBarSize"
+                      android:gravity="bottom"
+                      android:clipToPadding="false"
+                      android:clipChildren="false">

-    <LinearLayout android:id="@+id/conversation_container"
-                  android:layout_width="match_parent"
-                  android:layout_height="match_parent"
-                  android:orientation="vertical"
-                  android:paddingTop="?attr/actionBarSize"
-                  android:gravity="bottom"
-                  android:clipToPadding="false"
-                  android:clipChildren="false">
+            <ViewStub
+                    android:id="@+id/reminder_stub"
+                    android:layout="@layout/conversation_activity_reminderview_stub"
+                    android:inflatedId="@+id/reminder"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"/>

-        <ViewStub android:id="@+id/group_share_profile_view_stub"
-                  android:layout="@layout/conversation_activity_group_share_profile_stub"
-                  android:inflatedId="@+id/group_share_profile_view"
-                  android:layout_width="match_parent"
-                  android:layout_height="wrap_content"/>
+            <FrameLayout android:id="@+id/fragment_content"
+                         android:layout_width="match_parent"
+                         android:layout_height="0dp"
+                         android:layout_weight="1" />

-        <ViewStub android:id="@+id/unverified_banner_stub"
-                  android:layout="@layout/conversation_activity_unverified_banner_stub"
-                  android:inflatedId="@+id/unverified_banner"
-                  android:layout_width="match_parent"
-                  android:layout_height="wrap_content"/>
+            <ViewStub
+                    android:id="@+id/attachment_editor_stub"
+                    android:inflatedId="@+id/attachment_editor"
+                    android:layout="@layout/conversation_activity_attachment_editor_stub"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"/>

-        <ViewStub
-                android:id="@+id/reminder_stub"
-                android:layout="@layout/conversation_activity_reminderview_stub"
-                android:inflatedId="@+id/reminder"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"/>
+            <include layout="@layout/conversation_input_panel"/>

-        <FrameLayout android:id="@+id/fragment_content"
-                     android:layout_width="match_parent"
-                     android:layout_height="0dp"
-                     android:layout_weight="1" />
+            <Button android:id="@+id/register_button"
+                    android:layout_width="fill_parent"
+                    android:layout_height="wrap_content"
+                    android:padding="20dp"
+                    android:text="@string/conversation_activity__enable_signal_messages"
+                    android:visibility="gone"/>

-        <ViewStub
-                android:id="@+id/attachment_editor_stub"
-                android:inflatedId="@+id/attachment_editor"
-                android:layout="@layout/conversation_activity_attachment_editor_stub"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"/>
+            <Button android:id="@+id/make_default_sms_button"
+                    android:layout_width="fill_parent"
+                    android:layout_height="wrap_content"
+                    android:padding="20dp"
+                    android:text="@string/conversation_activity__enable_signal_for_sms"
+                    android:visibility="gone"/>

-        <include layout="@layout/conversation_input_panel"/>
-
-        <Button android:id="@+id/register_button"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:padding="20dp"
-                android:text="@string/conversation_activity__enable_signal_messages"
-                android:visibility="gone"/>
-
-        <Button android:id="@+id/unblock_button"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:padding="20dp"
-                android:text="@string/ConversationActivity_unblock"
-                android:visibility="gone"/>
-
-        <Button android:id="@+id/make_default_sms_button"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:padding="20dp"
-                android:text="@string/conversation_activity__enable_signal_for_sms"
-                android:visibility="gone"/>
-
-        <TextView android:id="@+id/space_left"
-                  android:paddingLeft="5dip"
-                  android:layout_width="fill_parent"
-                  android:layout_height="wrap_content"
-                  android:visibility="gone"
-                  android:background="?android:windowBackground"
-                  android:text="160/160 (1)" />
+            <TextView android:id="@+id/space_left"
+                      android:paddingLeft="5dip"
+                      android:layout_width="fill_parent"
+                      android:layout_height="wrap_content"
+                      android:visibility="gone"
+                      android:background="?android:windowBackground"
+                      android:text="160/160 (1)" />


-        <ViewStub
-                android:id="@+id/emoji_drawer_stub"
-                android:layout="@layout/conversation_activity_emojidrawer_stub"
-                android:inflatedId="@+id/emoji_drawer"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"/>
+            <ViewStub
+                    android:id="@+id/emoji_drawer_stub"
+                    android:layout="@layout/conversation_activity_emojidrawer_stub"
+                    android:inflatedId="@+id/emoji_drawer"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"/>

-    </LinearLayout>
-</org.thoughtcrime.securesms.components.camera.QuickAttachmentDrawer>
-</org.thoughtcrime.securesms.components.InputAwareLayout>
+        </LinearLayout>
+    </org.thoughtcrime.securesms.components.camera.QuickAttachmentDrawer>
+    </org.thoughtcrime.securesms.components.InputAwareLayout>
+</RelativeLayout>
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<org.thoughtcrime.securesms.profiles.GroupShareProfileView
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        android:id="@+id/group_share_profile_view"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content" />
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<org.thoughtcrime.securesms.components.identity.UnverifiedBannerView
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        android:id="@+id/unverified_banner"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content" />
@@ -2,7 +2,7 @@

 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
             xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/conversation_container"
+             android:id="@+id/conversation_container"
             android:layout_width="fill_parent"
             android:layout_height="match_parent">

@@ -34,6 +34,16 @@
              android:visibility="gone"
              tools:text="March 1, 2015" />

+    <TextView
+        android:id="@+id/no_messages_text_view"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:visibility="visible"
+        style="@style/NoMessagesTextView"
+        tools:text="@string/ConversationActivity_NoMessagesHint"
+        />
+
    <View android:id="@+id/compose_divider"
          android:layout_width="match_parent"
          android:layout_height="2dp"
@@ -14,7 +14,8 @@
        android:paddingTop="6dp"
        android:paddingBottom="6dp"
        android:clipChildren="false"
-        android:clipToPadding="false">
+        android:clipToPadding="false"
+        android:background="?attr/colorBackgroundFloating">

    <FrameLayout
        android:layout_width="0dp"
@@ -86,20 +86,6 @@
                    tools:visibility="visible"
                    tools:text="+14152222222"/>

-                <TextView
-                    android:id="@+id/group_message_sender_profile"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:paddingRight="4sp"
-                    android:paddingLeft="4sp"
-                    style="@style/Signal.Text.Preview"
-                    android:fontFamily="sans-serif-regular"
-                    android:textColor="?conversation_item_received_text_primary_color"
-                    android:textStyle="italic"
-                    android:maxLines="1"
-                    android:ellipsize="end"
-                    tools:text="~Clement Duval"/>
-
            </LinearLayout>

            <org.thoughtcrime.securesms.components.QuoteView
@@ -115,14 +101,6 @@
                app:quote_colorSecondary="?attr/conversation_item_quote_text_color"
                tools:visibility="visible"/>

-            <ViewStub
-                android:id="@+id/shared_contact_view_stub"
-                android:layout="@layout/conversation_item_received_shared_contact"
-                android:layout_width="@dimen/media_bubble_default_dimens"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/message_bubble_top_padding"
-                android:visibility="gone"/>
-
            <ViewStub
                android:id="@+id/image_view_stub"
                android:layout_width="wrap_content"
@@ -180,13 +158,5 @@

        </LinearLayout>

-        <org.thoughtcrime.securesms.components.AlertView
-            android:id="@+id/indicators_parent"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignParentRight="true"
-            android:orientation="vertical"
-            android:gravity="center_vertical"/>
-
    </RelativeLayout>
 </org.thoughtcrime.securesms.ConversationItem>
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<org.thoughtcrime.securesms.components.SharedContactView
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:id="@+id/shared_contact_view"
-    android:layout_width="@dimen/media_bubble_default_dimens"
-    android:layout_height="wrap_content"
-    app:contact_titleColor="?conversation_item_received_text_primary_color"
-    app:contact_captionColor="?conversation_item_received_text_secondary_color"
-    app:contact_footerIconColor="?conversation_item_received_text_secondary_color"
-    app:contact_footerAlpha="0.7"/>
@@ -51,14 +51,6 @@
                app:quote_colorSecondary="?attr/conversation_item_quote_text_color"
                tools:visibility="visible"/>

-            <ViewStub
-                android:id="@+id/shared_contact_view_stub"
-                android:layout="@layout/conversation_item_sent_shared_contact"
-                android:layout_width="@dimen/media_bubble_default_dimens"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/message_bubble_top_padding"
-                android:visibility="gone"/>
-
            <ViewStub
                android:id="@+id/image_view_stub"
                android:layout_width="wrap_content"
@@ -133,7 +125,10 @@

        </LinearLayout>

-        <org.thoughtcrime.securesms.components.AlertView
+        <!-- the following view is only left because it is used as a reference for positioning above.
+         removing would require some re-layouting, it's just not done yet.-->
+        <View
+            android:visibility="gone"
            android:id="@+id/indicators_parent"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<org.thoughtcrime.securesms.components.SharedContactView
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:id="@+id/shared_contact_view"
-    android:layout_width="@dimen/media_bubble_default_dimens"
-    android:layout_height="wrap_content"
-    app:contact_titleColor="?conversation_item_sent_text_primary_color"
-    app:contact_captionColor="?conversation_item_sent_text_secondary_color"
-    app:contact_footerIconColor="?conversation_item_sent_icon_color"/>
@@ -73,7 +73,7 @@
            android:layout_gravity="bottom|end"
            android:layout_margin="16dp"
            app:backgroundTint="@color/signal_primary"
-            android:src="@drawable/ic_create_white_24dp"
+            android:src="@drawable/ic_add_white_24dp"
            android:focusable="true"
            android:contentDescription="@string/conversation_list_fragment__fab_content_description"/>

@@ -8,9 +8,7 @@
        android:focusable="true"
        android:nextFocusRight="@+id/fab"
        android:nextFocusLeft="@+id/container"
-        android:layout_height="72dp"
-        android:paddingLeft="16dp"
-        android:paddingRight="16dp">
+        android:layout_height="72dp">

    <org.thoughtcrime.securesms.components.AvatarImageView
        android:id="@+id/contact_photo_image"
@@ -23,140 +21,124 @@
        android:cropToPadding="true"
        tools:src="@drawable/ic_contact_picture"
        android:contentDescription="@string/conversation_list_item_view__contact_photo_image"
-        android:layout_marginRight="12dp"
-        android:layout_marginEnd="12dp" />
+        android:layout_marginLeft="12dp"
+        android:layout_marginRight="12dp" />

-    <RelativeLayout android:layout_width="match_parent"
-                  android:layout_height="wrap_content"
-                  android:layout_marginLeft="4dp"
-                  android:layout_marginStart="4dp"
-                  android:layout_centerVertical="true"
-                  android:layout_toRightOf="@id/contact_photo_image"
-                  android:layout_toEndOf="@id/contact_photo_image"
-                  android:weightSum="1"
-                  android:orientation="horizontal">
+    <LinearLayout
+        android:orientation="horizontal"
+        android:gravity="center_vertical"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_toRightOf="@id/contact_photo_image"
+        android:layout_toEndOf="@id/contact_photo_image">

-        <org.thoughtcrime.securesms.components.FromTextView
-                  android:id="@+id/from"
-                  android:layout_width="match_parent"
-                  android:layout_height="wrap_content"
-                  android:layout_alignParentTop="true"
-                  android:layout_alignParentLeft="true"
-                  android:layout_alignParentStart="true"
-                  android:layout_toLeftOf="@+id/thumbnail"
-                  android:layout_toStartOf="@+id/thumbnail"
-                  style="@style/Signal.Text.Body"
-                  android:fontFamily="sans-serif-medium"
-                  android:textColor="?attr/conversation_list_item_contact_color"
-                  android:maxLines="1"
-                  tools:text="Jules Bonnot"
-                  android:ellipsize="end"
-                  android:layout_marginBottom="2dp"
-                  android:drawablePadding="5dp"/>
+        <LinearLayout
+            android:orientation="vertical"
+            android:layout_weight="2"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content">

-        <org.thoughtcrime.securesms.components.AlertView
-                android:id="@+id/indicators_parent"
-                android:layout_width="18dp"
-                android:layout_height="18dp"
-                android:paddingTop="2dp"
-                android:layout_marginRight="2dp"
-                android:layout_marginEnd="2dp"
-                android:layout_alignParentLeft="true"
-                android:layout_alignParentStart="true"
-                android:layout_below="@id/from"
-                app:useSmallIcon="true"
-                android:visibility="gone"
-                tools:visibility="visible"/>
+            <LinearLayout
+                android:id="@+id/from"
+                android:orientation="horizontal"
+                android:layout_marginBottom="2dp"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content">

-        <org.thoughtcrime.securesms.components.emoji.EmojiTextView
+                <ImageView
+                    android:id="@+id/group_indicator"
+                    android:layout_width="16dp"
+                    android:layout_height="16dp"
+                    android:layout_gravity="center_vertical"
+                    android:src="@drawable/ic_group_white_24dp"
+                    android:visibility="gone"
+                    android:layout_marginTop="1dp"
+                    android:layout_marginRight="5dp"
+                    android:layout_marginEnd="5dp" />
+
+                <org.thoughtcrime.securesms.components.FromTextView
+                    android:id="@+id/from_text"
+                    style="@style/Signal.Text.Body"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:drawablePadding="5dp"
+                    android:ellipsize="end"
+                    android:fontFamily="sans-serif-medium"
+                    android:maxLines="1"
+                    android:textColor="?attr/conversation_list_item_contact_color"
+                    tools:text="Jules Bonnot" />
+
+            </LinearLayout>
+
+            <org.thoughtcrime.securesms.components.emoji.EmojiTextView
                android:id="@+id/subject"
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
-                android:layout_below="@id/from"
-                android:layout_toRightOf="@id/indicators_parent"
-                android:layout_toEndOf="@id/indicators_parent"
-                android:layout_toLeftOf="@+id/status"
-                android:layout_toStartOf="@+id/status"
-                android:paddingRight="1dp"
                style="@style/Signal.Text.Preview"
                android:textColor="?attr/conversation_list_item_subject_color"
                android:maxLines="1"
                tools:text="Wheels arrive at 3pm flat. This is a somewhat longer message."
                android:ellipsize="end" />

-        <org.thoughtcrime.securesms.components.ThumbnailView
-                android:id="@+id/thumbnail"
-                android:layout_width="40dp"
-                android:layout_height="40dp"
-                android:layout_gravity="center_horizontal"
-                android:layout_marginRight="5dp"
-                android:layout_marginLeft="5dp"
-                android:layout_toLeftOf="@+id/date"
-                android:layout_toStartOf="@+id/date"
-                android:layout_alignParentTop="true"
-                android:layout_marginTop="5dp"
-                android:contentDescription="@string/conversation_activity__attachment_thumbnail"
-                android:visibility="gone"
-                tools:src="@drawable/ic_video_light"
-                tools:visibility="visible" />
+        </LinearLayout>

-        <TextView android:id="@id/date"
-                  android:layout_marginLeft="3dp"
-                  android:layout_marginStart="3dp"
-                  android:layout_height="wrap_content"
-                  android:layout_width="wrap_content"
-                  android:layout_alignParentRight="true"
-                  android:layout_alignParentEnd="true"
-                  android:layout_alignBaseline="@+id/from"
-                  android:layout_above="@id/subject"
-                  style="@style/Signal.Text.Caption"
-                  android:textColor="?attr/conversation_list_item_date_color"
-                  android:textAllCaps="true"
-                  tools:text="30 mins"
-                  android:singleLine="true"/>
+        <LinearLayout
+            android:orientation="vertical"
+            android:gravity="end"
+            android:layout_marginLeft="24dp"
+            android:layout_marginStart="24dp"
+            android:layout_marginRight="12dp"
+            android:layout_marginEnd="12dp"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content">

-        <TextView android:id="@+id/archived"
-                  android:layout_width="wrap_content"
-                  android:layout_height="wrap_content"
-                  android:layout_below="@id/date"
-                  android:layout_alignParentRight="true"
-                  android:layout_alignParentEnd="true"
-                  android:layout_alignBaseline="@id/subject"
-                  android:layout_marginLeft="5dp"
-                  android:layout_marginStart="5dp"
-                  android:paddingLeft="6dp"
-                  android:paddingRight="6dp"
-                  android:paddingTop="2dp"
-                  android:paddingBottom="2dp"
-                  style="@style/Signal.Text.Caption"
-                  android:text="@string/conversation_list_item_view__archived"
-                  android:textColor="@color/core_white"
-                  android:textAllCaps="true"
-                  android:background="@drawable/archived_indicator_background" />
+            <TextView android:id="@id/date"
+                      android:layout_height="wrap_content"
+                      android:layout_width="wrap_content"
+                      style="@style/Signal.Text.Caption"
+                      android:textColor="?attr/conversation_list_item_date_color"
+                      android:textAllCaps="true"
+                      tools:text="30 mins"
+                      android:singleLine="true"/>

+            <LinearLayout
+                android:orientation="horizontal"
+                android:minHeight="20dp"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content">

-        <FrameLayout android:id="@+id/status"
-                     android:layout_width="wrap_content"
-                     android:layout_height="wrap_content"
-                     android:layout_marginTop="4dp"
-                     android:layout_below="@id/date"
-                     android:layout_toLeftOf="@id/archived"
-                     android:layout_toStartOf="@id/archived"
-                     android:layout_alignWithParentIfMissing="true">
+                <TextView android:id="@+id/archived"
+                          android:layout_width="wrap_content"
+                          android:layout_height="wrap_content"
+                          android:paddingLeft="6dp"
+                          android:paddingRight="6dp"
+                          android:paddingTop="2dp"
+                          android:paddingBottom="2dp"
+                          style="@style/Signal.Text.Caption"
+                          android:text="@string/conversation_list_item_view__archived"
+                          android:textColor="@color/core_white"
+                          android:textAllCaps="true"
+                          android:background="@drawable/archived_indicator_background" />

-            <org.thoughtcrime.securesms.components.DeliveryStatusView
-                    android:id="@+id/delivery_status"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_vertical"
-                    app:iconColor="?attr/conversation_list_item_delivery_icon_color"/>
+                <org.thoughtcrime.securesms.components.DeliveryStatusView
+                          android:id="@+id/delivery_status"
+                          android:layout_marginTop="6dp"
+                          android:layout_width="wrap_content"
+                          android:layout_height="wrap_content"
+                          app:iconColor="?attr/conversation_list_item_delivery_icon_color"/>

-            <ImageView android:id="@+id/unread_indicator"
-                       android:layout_width="24dp"
-                       android:layout_height="24dp"/>
+                <ImageView android:id="@+id/unread_indicator"
+                          android:layout_width="24dp"
+                          android:layout_height="24dp"/>
+            </LinearLayout>

-        </FrameLayout>
+        </LinearLayout>

-    </RelativeLayout>
+    </LinearLayout>
+
+    <View android:layout_width="match_parent"
+          android:layout_height="1dp"
+          android:layout_alignParentBottom="true"
+          android:background="@drawable/attachment_selector_shadow"/>

 </org.thoughtcrime.securesms.ConversationListItem>
@@ -39,59 +39,38 @@
            tools:src="@drawable/ic_contact_picture"
            android:contentDescription="@string/conversation_list_item_view__contact_photo_image"/>

-    <RelativeLayout android:id="@+id/content"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_toRightOf="@id/contact_photo_image"
-                    android:layout_toEndOf="@id/contact_photo_image"
-                    android:layout_centerVertical="true">
+    <LinearLayout
+        android:orientation="vertical"
+        android:id="@+id/content"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_centerVertical="true"
+        android:layout_toEndOf="@id/contact_photo_image"
+        android:layout_toRightOf="@id/contact_photo_image">

        <org.thoughtcrime.securesms.components.emoji.EmojiTextView
-                android:id="@+id/title"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:maxLines="1"
-                android:ellipsize="end"
-                android:textSize="18dp"
-                android:transitionName="recipient_name"
-                android:drawablePadding="5dp"
-                android:gravity="center_vertical"
-                android:layout_gravity="center_vertical"
-                android:layout_alignParentLeft="true"
-                android:layout_alignParentStart="true"
-                android:layout_alignParentTop="true"
-                style="@style/TextSecure.TitleTextStyle"
-                tools:ignore="UnusedAttribute"/>
-
-        <ImageView android:id="@+id/verified_indicator"
-                   android:src="@drawable/ic_check_circle_white_18dp"
-                   android:layout_width="wrap_content"
-                   android:layout_height="wrap_content"
-                   android:layout_marginRight="3dp"
-                   android:layout_marginEnd="3dp"
-                   android:layout_gravity="bottom"
-                   android:layout_alignParentLeft="true"
-                   android:layout_alignParentStart="true"
-                   android:layout_below="@id/title"
-                   android:alpha="0.7"
-                   android:visibility="gone"/>
+            android:id="@+id/title"
+            style="@style/TextSecure.TitleTextStyle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:drawablePadding="5dp"
+            android:ellipsize="end"
+            android:maxLines="1"
+            android:textSize="18dp"
+            android:transitionName="recipient_name"
+            tools:text="Jules Bonnot" />

        <org.thoughtcrime.securesms.components.emoji.EmojiTextView
-                android:id="@+id/subtitle"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:maxLines="1"
-                android:ellipsize="end"
-                android:layout_gravity="center_vertical|start"
-                android:gravity="center_vertical"
-                android:layout_toRightOf="@id/verified_indicator"
-                android:layout_toEndOf="@id/verified_indicator"
-                android:layout_below="@id/title"
-                android:textDirection="ltr"
-                android:textSize="13dp"
-                tools:text="(123) 123-1234"
-                style="@style/TextSecure.SubtitleTextStyle"/>
+            android:id="@+id/subtitle"
+            style="@style/TextSecure.SubtitleTextStyle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:ellipsize="end"
+            android:maxLines="1"
+            android:textDirection="ltr"
+            android:textSize="13dp"
+            tools:text="(123) 123-1234" />

-    </RelativeLayout>
+    </LinearLayout>

 </org.thoughtcrime.securesms.ConversationTitleView>
@@ -13,6 +13,7 @@
              android:horizontalSpacing="0dp"
              android:verticalSpacing="0dp"
              android:numColumns="auto_fit"
-              android:gravity="center"/>
+              android:gravity="center"
+              android:background="?emoji_tab_strip_background"/>

 </FrameLayout>
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                xmlns:app="http://schemas.android.com/apk/res-auto"
-                android:layout_height="match_parent"
-                android:layout_width="match_parent"
-                android:orientation="vertical">
-
-    <android.support.design.widget.CoordinatorLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_above="@+id/giphy_logo"
-            android:orientation="vertical">
-
-        <android.support.design.widget.AppBarLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:background="?attr/colorPrimary">
-
-            <org.thoughtcrime.securesms.giph.ui.GiphyActivityToolbar
-                    android:id="@+id/giphy_toolbar"
-                    android:layout_height="wrap_content"
-                    android:layout_width="match_parent"
-                    android:background="?attr/colorPrimary"
-                    android:theme="?attr/actionBarStyle"
-                    app:layout_scrollFlags="scroll|enterAlways"/>
-
-            <android.support.design.widget.TabLayout
-                    android:id="@+id/tab_layout"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:theme="?attr/actionBarTabBarStyle"
-                    android:scrollbars="horizontal"/>
-
-        </android.support.design.widget.AppBarLayout>
-
-        <android.support.v4.view.ViewPager
-                android:id="@+id/giphy_pager"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                app:layout_behavior="@string/appbar_scrolling_view_behavior"/>
-
-    </android.support.design.widget.CoordinatorLayout>
-
-    <ImageView android:id="@+id/giphy_logo"
-               android:src="@drawable/poweredby_giphy"
-               android:layout_width="match_parent"
-               android:layout_height="wrap_content"
-               android:layout_alignParentBottom="true"
-               android:padding="10dp"
-               android:background="@color/black"/>
-
-</RelativeLayout>
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<merge xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <LinearLayout android:layout_width="match_parent"
-                  android:layout_height="match_parent"
-                  android:orientation="horizontal">
-
-        <ImageView android:id="@+id/action_icon"
-                   android:layout_width="wrap_content"
-                   android:layout_height="wrap_content"
-                   android:layout_gravity="center_vertical"
-                   android:gravity="center_vertical"
-                   android:clickable="true"
-                   android:background="@drawable/circle_touch_highlight_background"
-                   android:src="@drawable/ic_search_white_24dp" />
-
-        <LinearLayout android:id="@+id/toggle_container"
-                      android:layout_width="match_parent"
-                      android:layout_height="match_parent"
-                      android:orientation="horizontal">
-
-            <EditText android:id="@+id/search_view"
-                      android:layout_height="wrap_content"
-                      android:layout_width="0px"
-                      android:layout_weight="1"
-                      android:layout_marginLeft="5dp"
-                      android:layout_marginStart="5dp"
-                      android:hint="@string/giphy_activity_toolbar__search_gifs_and_stickers"
-                      android:textColor="@color/white"
-                      android:textColorHint="@color/white"
-                      android:textCursorDrawable="@null"
-                      android:maxLines="1"
-                      android:singleLine="true"
-                      android:ellipsize="end"
-                      android:imeOptions="actionSearch"
-                      android:background="@android:color/transparent"
-                      android:layout_gravity="center_vertical"
-                      android:gravity="center_vertical"/>
-
-            <ImageView android:id="@+id/search_clear"
-                       android:layout_width="wrap_content"
-                       android:layout_height="wrap_content"
-                       android:layout_gravity="center_vertical"
-                       android:gravity="center_vertical"
-                       android:clickable="true"
-                       android:focusable="true"
-                       android:visibility="invisible"
-                       android:background="@drawable/circle_touch_highlight_background"
-                       android:src="@drawable/ic_clear_white_24dp" />
-
-            <org.thoughtcrime.securesms.components.AnimatingToggle
-                    android:id="@+id/button_toggle"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center"
-                    android:paddingLeft="10dp"
-                    android:paddingRight="10dp"
-                    android:gravity="center">
-
-                <ImageView android:id="@+id/view_grid"
-                           android:layout_width="wrap_content"
-                           android:layout_height="wrap_content"
-                           android:layout_gravity="center_vertical"
-                           android:gravity="center_vertical"
-                           android:clickable="true"
-                           android:visibility="visible"
-                           android:focusable="true"
-                           android:background="@drawable/circle_touch_highlight_background"
-                           android:src="@drawable/ic_dashboard_white_24dp" />
-
-                <ImageView android:id="@+id/view_stream"
-                           android:layout_width="wrap_content"
-                           android:layout_height="wrap_content"
-                           android:layout_gravity="center_vertical"
-                           android:gravity="center_vertical"
-                           android:visibility="gone"
-                           android:clickable="true"
-                           android:focusable="true"
-                           android:background="@drawable/circle_touch_highlight_background"
-                           android:src="@drawable/ic_view_stream_white_24dp" />
-
-            </org.thoughtcrime.securesms.components.AnimatingToggle>
-
-        </LinearLayout>
-
-    </LinearLayout>
-
-</merge>
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-             android:layout_width="match_parent"
-             android:layout_height="match_parent">
-
-    <android.support.v7.widget.RecyclerView
-            android:id="@+id/giphy_list"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:scrollbars="vertical"/>
-
-    <ProgressBar android:id="@+id/loading_progress"
-                 android:layout_width="wrap_content"
-                 android:layout_height="wrap_content"
-                 android:layout_gravity="center"
-                 android:visibility="visible"
-                 android:indeterminate="true"/>
-
-    <TextView android:id="@+id/no_results"
-              android:text="@string/giphy_fragment__nothing_found"
-              android:gravity="center"
-              android:layout_width="match_parent"
-              android:layout_height="wrap_content"
-              android:visibility="gone"
-              android:layout_gravity="center"/>
-
-</FrameLayout>
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-             android:layout_width="match_parent"
-             android:layout_height="wrap_content"
-             xmlns:tools="http://schemas.android.com/tools">
-
-    <org.thoughtcrime.securesms.giph.ui.AspectRatioImageView
-            android:id="@+id/thumbnail"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:scaleType="fitXY" />
-
-    <ProgressBar android:id="@+id/gif_progress"
-                 android:layout_width="wrap_content"
-                 android:layout_height="wrap_content"
-                 android:indeterminate="true"
-                 android:visibility="gone"
-                 tools:visibility="visible"
-                 android:layout_gravity="center"
-                 android:gravity="center"/>
-
-</FrameLayout>
@@ -68,25 +68,47 @@

    </RelativeLayout>

-    <com.dd.CircularProgressButton
-        android:id="@+id/add_member_button"
-        android:layout_width="wrap_content"
-        android:layout_height="40dp"
-        android:background="@color/signal_primary"
-        android:layout_marginStart="15dp"
-        android:layout_marginLeft="15dp"
-        android:layout_marginBottom="15dp"
-        android:paddingEnd="12dp"
-        android:paddingStart="12dp"
-        android:textColor="@color/white"
-        app:cpb_colorIndicator="@color/white"
-        app:cpb_colorProgress="@color/textsecure_primary"
-        app:cpb_cornerRadius="20dp"
-        app:cpb_selectorIdle="@drawable/progress_button_state"
-        app:cpb_textIdle="@string/recipients_panel__add_members"
-        app:layout_constraintBottom_toTopOf="@id/skip_button_bottom_spacer"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"/>
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal">
+
+        <com.dd.CircularProgressButton
+            android:id="@+id/add_member_button"
+            android:layout_width="wrap_content"
+            android:layout_height="40dp"
+            android:background="@color/signal_primary"
+            android:layout_marginStart="15dp"
+            android:layout_marginLeft="15dp"
+            android:layout_marginBottom="15dp"
+            android:paddingEnd="12dp"
+            android:paddingStart="12dp"
+            android:textColor="@color/white"
+            app:cpb_colorIndicator="@color/white"
+            app:cpb_colorProgress="@color/textsecure_primary"
+            app:cpb_cornerRadius="20dp"
+            app:cpb_selectorIdle="@drawable/progress_button_state"
+            app:cpb_textIdle="@string/recipients_panel__add_members"/>
+
+        <com.dd.CircularProgressButton
+            android:id="@+id/verify_button"
+            android:layout_width="wrap_content"
+            android:layout_height="40dp"
+            android:background="@color/signal_primary"
+            android:layout_marginStart="15dp"
+            android:layout_marginLeft="15dp"
+            android:layout_marginBottom="15dp"
+            android:paddingEnd="12dp"
+            android:paddingStart="12dp"
+            android:textColor="@color/white"
+            app:cpb_colorIndicator="@color/white"
+            app:cpb_colorProgress="@color/textsecure_primary"
+            app:cpb_cornerRadius="20dp"
+            app:cpb_selectorIdle="@drawable/progress_button_state"
+            android:visibility="gone"
+            app:cpb_textIdle="@string/qr_show_activity__title"/>
+
+    </LinearLayout>

    <ListView android:id="@+id/selected_contacts_list"
        android:layout_width="match_parent"
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>

-<FrameLayout android:layout_width="match_parent"
+<FrameLayout xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
             android:layout_height="match_parent"
             xmlns:android="http://schemas.android.com/apk/res/android"
             xmlns:app="http://schemas.android.com/apk/res-auto">
@@ -23,42 +24,39 @@
                       android:layout_height="64dp"
                       android:transitionName="avatar"/>

-            <org.thoughtcrime.securesms.components.emoji.EmojiEditText
-                    android:id="@+id/name"
-                    android:hint="@string/profile_create_activity__your_name"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_vertical"
-                    android:layout_weight="1"
-                    android:layout_marginLeft="10dp"
-                    android:inputType="textCapWords"/>
+            <android.support.design.widget.TextInputLayout
+                android:id="@+id/name"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="10dp">

-            <org.thoughtcrime.securesms.components.emoji.EmojiToggle
-                    android:id="@+id/emoji_toggle"
-                    android:layout_width="37dp"
-                    android:layout_height="37dp"
-                    android:layout_gravity="center_vertical"
-                    android:background="@drawable/touch_highlight_background"
-                    android:contentDescription="@string/conversation_activity__emoji_toggle_description" />
+                <android.support.design.widget.TextInputEditText
+                    android:id="@+id/name_text"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:hint="@string/profile_create_activity__your_name"
+                    android:inputType="textCapWords" />
+            </android.support.design.widget.TextInputLayout>

        </LinearLayout>

-        <android.support.design.widget.TextInputLayout
-            android:id="@+id/status"
-            android:layout_marginTop="4dp"
-            android:layout_marginLeft="16dp"
-            android:layout_marginRight="16dp"
+    <android.support.design.widget.TextInputLayout
+        android:id="@+id/status"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="16dp"
+        android:layout_marginRight="16dp"
+        android:layout_marginTop="16dp">
+
+        <android.support.design.widget.TextInputEditText
+            android:id="@+id/status_text"
            android:layout_width="match_parent"
-            android:layout_height="wrap_content">
-
-            <android.support.design.widget.TextInputEditText
-                android:id="@+id/status_text"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:hint="@string/default_status_hint"
-                android:inputType="text" />
-
-        </android.support.design.widget.TextInputLayout>
+            android:layout_height="wrap_content"
+            android:gravity="top|left"
+            android:hint="@string/default_status_hint"
+            android:inputType="textMultiLine"
+            android:maxLines="3" />
+    </android.support.design.widget.TextInputLayout>

        <LinearLayout android:id="@+id/information_link_container"
                      android:clickable="true"
@@ -78,16 +76,17 @@
                       android:src="@drawable/ic_info_white_18dp"
                       android:tint="#73B7F0"/>

-            <TextView style="@style/Registration.Description"
-                      android:id="@+id/information_label"
-                      android:clickable="true"
-                      android:layout_width="wrap_content"
-                      android:layout_height="match_parent"
-                      android:layout_marginLeft="3dp"
-                      android:layout_gravity="center_vertical"
-                      android:gravity="center_vertical"
-                      android:textColor="#73B7F0"
-                      android:text="@string/profile_create_activity__who_can_see_this_information"/>
+            <TextView
+                android:id="@+id/information_label"
+                style="@style/Registration.Description"
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:layout_gravity="center_vertical"
+                android:layout_marginLeft="3dp"
+                android:clickable="true"
+                android:gravity="center_vertical"
+                android:text="@string/profile_create_activity__who_can_see_this_information"
+                android:textColor="#73B7F0" />
        </LinearLayout>


@@ -98,31 +97,18 @@
                      android:clipChildren="false"
                      android:clipToPadding="false">

-            <com.dd.CircularProgressButton
-                    android:id="@+id/finish_button"
-                    app:cpb_textIdle="@string/profile_create_activity__finish"
-                    app:cpb_selectorIdle="@drawable/progress_button_state"
-                    app:cpb_colorIndicator="@color/white"
-                    app:cpb_colorProgress="@color/textsecure_primary"
-                    app:cpb_cornerRadius="50dp"
-                    android:textAllCaps="true"
-                    android:background="@color/signal_primary"
-                    android:textColor="@color/white"
-                    android:layout_width="match_parent"
-                    android:layout_height="50dp"
-                    android:layout_marginLeft="16dp"
-                    android:layout_marginRight="16dp"
-                    android:layout_marginBottom="20dp"
-                    android:layout_gravity="center_horizontal"/>
-
-            <TextView android:id="@+id/password_account_settings_button"
-                      android:layout_gravity="center_horizontal"
-                      android:layout_width="wrap_content"
-                      android:layout_height="wrap_content"
-                      android:layout_marginTop="0dp"
-                      android:layout_marginBottom="20dp"
-                      android:textColor="@color/gray50"
-                      android:text="@string/profile_create_activity__password_account"/>
+            <TextView
+                android:id="@+id/password_account_settings_button"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_horizontal"
+                android:layout_marginBottom="20dp"
+                android:layout_marginTop="0dp"
+                android:text="@string/profile_create_activity__password_account"
+                android:textColor="#73B7F0"
+                android:textSize="16sp"
+                android:textStyle="normal"
+                android:typeface="sans" />

            <org.thoughtcrime.securesms.components.emoji.EmojiDrawer
                    xmlns:android="http://schemas.android.com/apk/res/android"
@@ -135,10 +121,11 @@

 </org.thoughtcrime.securesms.components.InputAwareLayout>

-    <View android:id="@+id/reveal"
-          android:background="@color/textsecure_primary"
-          android:layout_width="match_parent"
-          android:layout_height="match_parent"
-          android:visibility="invisible"/>
+    <View
+        android:id="@+id/reveal"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@color/textsecure_primary"
+        android:visibility="invisible" />

 </FrameLayout>
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<merge
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical">
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="@dimen/message_bubble_horizontal_padding"
-            android:layout_marginRight="@dimen/message_bubble_horizontal_padding"
-            android:orientation="horizontal"
-            android:gravity="center_vertical">
-
-            <ImageView
-                android:id="@+id/contact_avatar"
-                android:layout_width="48dp"
-                android:layout_height="48dp"
-                android:layout_marginEnd="8dp"
-                android:layout_marginRight="8dp"/>
-
-            <LinearLayout
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:orientation="vertical">
-
-                <org.thoughtcrime.securesms.components.emoji.EmojiTextView
-                    android:id="@+id/contact_name"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginBottom="4dp"
-                    style="@style/Signal.Text.Body"
-                    android:maxLines="1"
-                    android:ellipsize="end"
-                    android:fontFamily="sans-serif-medium"
-                    android:textSize="16sp"
-                    tools:text="Peter Parker"/>
-
-                <TextView
-                    android:id="@+id/contact_number"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    style="@style/Signal.Text.Caption"
-                    android:maxLines="1"
-                    android:ellipsize="end"
-                    android:textColor="@color/grey_600"
-                    tools:text="(610) 555-5555"/>
-
-            </LinearLayout>
-
-        </LinearLayout>
-
-        <org.thoughtcrime.securesms.components.ConversationItemFooter
-            android:id="@+id/contact_footer"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="@dimen/message_bubble_horizontal_padding"
-            android:layout_marginRight="@dimen/message_bubble_horizontal_padding"
-            android:layout_marginTop="4dp"
-            android:elevation="9dp"
-            android:orientation="horizontal" />
-
-        <TextView
-            android:id="@+id/contact_action_button"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/message_bubble_bottom_padding"
-            android:gravity="center"
-            android:padding="10dp"
-            style="@style/Signal.Text.Preview"
-            android:maxLines="1"
-            android:ellipsize="end"
-            android:fontFamily="sans-serif-medium"
-            android:textColor="@color/core_blue"
-            android:background="?attr/shared_contact_item_button_color"
-            android:foreground="?attr/selectableItemBackground"
-            tools:text="Add to Contacts"/>
-
-    </LinearLayout>
-
-</merge>
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android">

+    <item android:title="@string/conversation__menu_view_profile"
+          android:id="@+id/menu_conversation_settings"/>
+
    <item android:title="@string/conversation__menu_add_attachment"
          android:id="@+id/menu_add_attachment" />

    <item android:title="@string/conversation__menu_view_all_media"
          android:id="@+id/menu_view_media" />

-    <item android:title="@string/conversation__menu_conversation_settings"
-          android:id="@+id/menu_conversation_settings"/>
-
 </menu>
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<menu xmlns:android="http://schemas.android.com/apk/res/android"
-      xmlns:app="http://schemas.android.com/apk/res-auto">
-
-    <item android:id="@+id/menu_add_to_contacts"
-          android:title="@string/conversation_add_to_contacts__menu_add_to_contacts"
-          app:showAsAction="never" />
-
-</menu>
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:title="@string/conversation__menu_archive_chat"
+          android:id="@+id/menu_archive_chat"/>
+
+</menu>
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android">

-    <item android:title="@string/conversation_insecure__invite"
-          android:id="@+id/menu_invite"/>
+    <item android:title="@string/conversation__menu_delete_chat"
+          android:id="@+id/menu_delete_chat"/>

 </menu>
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android"
-      xmlns:app="http://schemas.android.com/apk/res-auto">
-
-    <item android:title="@string/conversation_expiring_off__disappearing_messages"
-          android:id="@+id/menu_expiring_messages_off"
-          android:icon="@drawable/ic_timer_off_white_24dp"/>
-
-</menu>
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android"
-      xmlns:app="http://schemas.android.com/apk/res-auto">
-
-    <item android:id="@+id/menu_expiring_messages"
-          app:actionLayout="@layout/expiration_timer_menu"
-          app:showAsAction="always"
-          android:title="@string/menu_conversation_expiring_on__messages_expiring"/>
-
-</menu>
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
-
-    <item android:title="@string/convesation_group_options__recipients_list"
-          android:id="@+id/menu_group_recipients"
-          android:icon="?menu_group_icon"
-          app:showAsAction="ifRoom" />
-
-</menu>
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
-
-    <item android:title="@string/conversation_group_options__delivery"
-          android:id="@+id/menu_group_delivery"
-          android:icon="?menu_split_icon"
-          app:showAsAction="ifRoom" >
-
-        <menu>
-            <group android:id="@+id/distribution_group"
-                   android:checkableBehavior="single">
-                <item android:id="@+id/menu_distribution_conversation" android:title="@string/conversation_group_options__conversation" android:checked="true" />
-                <item android:id="@+id/menu_distribution_broadcast" android:title="@string/conversation_group_options__broadcast" />
-            </group>
-        </menu>
-    </item>
-</menu>
@@ -3,7 +3,8 @@

    <item android:id="@+id/menu_edit_group"
          android:title="@string/conversation__menu_edit_group"
-          app:showAsAction="collapseActionView" />
+          android:icon="?menu_group_icon"
+          app:showAsAction="ifRoom" />

    <item android:id="@+id/menu_leave"
          android:title="@string/conversation__menu_leave_group"
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-      <item android:title="@string/conversation_secure_verified__menu_reset_secure_session"
-            android:id="@+id/menu_reset_secure_session"/>
-</menu>
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:title="@string/conversation__menu_unarchive_chat"
+          android:id="@+id/menu_archive_chat"/>
+
+</menu>
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+    <item
+        android:id="@+id/menu_create_profile"
+        android:title="@string/profile_create_activity__finish"
+        app:showAsAction="always"
+        android:icon="?menu_accept_icon"/>
+</menu>
@@ -1,19 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <item android:title="@string/qr_scan_activity__title"
+          android:id="@+id/menu_qr_scan"
+          android:icon="@drawable/ic_ab_qr"
+          app:showAsAction="always"/>
+
+    <item android:title="@string/qr_show_activity__title"
+        android:id="@+id/menu_qr_show" />

    <item android:title="@string/text_secure_normal__menu_new_chat"
          android:id="@+id/menu_new_chat" />

+    <item android:title="@string/menu_deaddrop"
+          android:id="@+id/menu_deaddrop" />
+
    <item android:title="@string/text_secure_normal__menu_clear_passphrase"
          android:id="@+id/menu_clear_passphrase" />

-    <item android:title="@string/text_secure_normal__invite_friends"
-          android:id="@+id/menu_invite" />
-
    <item android:title="@string/text_secure_normal__menu_settings"
          android:id="@+id/menu_settings" />

-    <item android:title="@string/text_secure_normal__help"
-          android:id="@+id/menu_help"/>
-
 </menu>
@@ -320,12 +320,9 @@
  <!--GcmRefreshJob-->
  <string name="GcmRefreshJob_Permanent_Signal_communication_failure">فشل دائما في اتصال سيجنال!</string>
  <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">سيجنال لم يتمكن من التسجيل مع خدمات جوجل بلاي، وتم تعطيل رسائل ومكالمات سيجنال. رجاء محاولة إعادة التسجيل عبر قائمة الإعدادات بالتطبيق ثم اختيار متقدم.</string>
-  <!--GiphyActivity-->
-  <string name="GiphyActivity_error_while_retrieving_full_resolution_gif">خطأ أثناء جلب كامل دقة صورة GIF</string>
-  <!--GiphyFragmentPageAdapter-->
-  <string name="GiphyFragmentPagerAdapter_gifs">صور GIF</string>
-  <string name="GiphyFragmentPagerAdapter_stickers">لصاقات</string>
-  <!--GroupCreateActivity-->
+
+
+    <!--GroupCreateActivity-->
  <string name="GroupCreateActivity_actionbar_title">مجموعة جديدة</string>
  <string name="GroupCreateActivity_actionbar_edit_title">تدقيق المجموعة</string>
  <string name="GroupCreateActivity_group_name_hint">أسم المجموعة</string>
@@ -791,11 +788,9 @@
  <string name="IdentityUtil_untrusted_dialog_one">لقد تغير رقم أمانك مع %s الآن.</string>
  <string name="IdentityUtil_untrusted_dialog_two">لقد تغير الآن بيان سلامة المحادثة مع %1$s و%2$s.</string>
  <string name="IdentityUtil_untrusted_dialog_many">لقد تغير رقم أمانك مع %1$s و  %2$s و %3$s الآن.</string>
-  <!--giphy_activity-->
-  <string name="giphy_activity_toolbar__search_gifs_and_stickers">ابحث في صور GIF واللصاقات</string>
-  <!--giphy_fragment-->
-  <string name="giphy_fragment__nothing_found">لا يوجد شيء</string>
-  <!--log_submit_activity-->
+
+
+    <!--log_submit_activity-->
  <string name="log_submit_activity__log_fetch_failed">تعذر التقاط السجلات من هاتفك. يمكنك استخدام ADB للحصول على سجل التشغيل  بدلا من ذلك.</string>
  <string name="log_submit_activity__thanks">شكرا للمساعدة!</string>
  <string name="log_submit_activity__submitting">إرسال</string>
@@ -94,8 +94,7 @@
  <string name="ExportFragment_cancel">Адмена</string>
  <string name="ExportFragment_exporting">Экспарт</string>
  <!--GcmRefreshJob-->
-  <!--GiphyActivity-->
-  <!--GiphyFragmentPageAdapter-->
+
  <!--GroupCreateActivity-->
  <string name="GroupCreateActivity_actionbar_title">Новая група</string>
  <string name="GroupCreateActivity_group_name_hint">Імя групы</string>
@@ -276,8 +275,8 @@
  <!--expiration-->
  <string name="expiration_off">Выкл</string>
  <!--unverified safety numbers-->
-  <!--giphy_activity-->
-  <!--giphy_fragment-->
+
+
  <!--import_export_fragment-->
  <!--log_submit_activity-->
  <string name="log_submit_activity__thanks">Дзякуй за вашу дапамогу!</string>
@@ -261,12 +261,9 @@
  <!--GcmRefreshJob-->
  <string name="GcmRefreshJob_Permanent_Signal_communication_failure">Перманентна Сигнал комуникационна грешка!</string>
  <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Сигнал не успя да се регистрира с Google Play Services. Сигнал съообщения и разговори са деактивирани, моля пререгистрирайте през менюто Настройки &gt; Допълнителние.</string>
-  <!--GiphyActivity-->
-  <string name="GiphyActivity_error_while_retrieving_full_resolution_gif">Грешка при вземането на GIF в пълна резолюция</string>
-  <!--GiphyFragmentPageAdapter-->
-  <string name="GiphyFragmentPagerAdapter_gifs">GIF-ове</string>
-  <string name="GiphyFragmentPagerAdapter_stickers">Стикери</string>
-  <!--GroupCreateActivity-->
+
+
+    <!--GroupCreateActivity-->
  <string name="GroupCreateActivity_actionbar_title">Нова група</string>
  <string name="GroupCreateActivity_actionbar_edit_title">Промяна на групата</string>
  <string name="GroupCreateActivity_group_name_hint">Име на групата</string>
@@ -711,11 +708,9 @@
    <item quantity="one">%d друг</item>
    <item quantity="other">%d други</item>
  </plurals>
-  <!--giphy_activity-->
-  <string name="giphy_activity_toolbar__search_gifs_and_stickers">Търсене сред GIF-ове и стикери</string>
-  <!--giphy_fragment-->
-  <string name="giphy_fragment__nothing_found">Няма нищо открито</string>
-  <!--log_submit_activity-->
+
+
+    <!--log_submit_activity-->
  <string name="log_submit_activity__log_fetch_failed">Неуспешно прочитане на доклада на Вашето устройство. Все пак може да използвате ADB, за да получите доклада.</string>
  <string name="log_submit_activity__thanks">Благодаря за помоща!</string>
  <string name="log_submit_activity__submitting">Изпращане</string>
@@ -265,12 +265,9 @@
  <!--GcmRefreshJob-->
  <string name="GcmRefreshJob_Permanent_Signal_communication_failure">La comunicació del Delta Chat falla contínuament!</string>
  <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">El Delta Chat no s\'ha pogut registrar al Google Play Services. Els missatges i les trucades del Delta Chat s\'han inhabilitat, registreu-vos de nou a Configuració &gt; Avançada.</string>
-  <!--GiphyActivity-->
-  <string name="GiphyActivity_error_while_retrieving_full_resolution_gif">S\'ha produït un error en recuperar el GIF a resolució completa</string>
-  <!--GiphyFragmentPageAdapter-->
-  <string name="GiphyFragmentPagerAdapter_gifs">GIF</string>
-  <string name="GiphyFragmentPagerAdapter_stickers">Adhesius</string>
-  <!--GroupCreateActivity-->
+
+
+    <!--GroupCreateActivity-->
  <string name="GroupCreateActivity_actionbar_title">Grup nou</string>
  <string name="GroupCreateActivity_actionbar_edit_title">Edita el grup</string>
  <string name="GroupCreateActivity_group_name_hint">Nom del grup</string>
@@ -723,11 +720,9 @@ S\'ha rebut un missatge d\'intercanvi de claus per a una versió del protocol no
    <item quantity="one">%d altre</item>
    <item quantity="other">%d més</item>
  </plurals>
-  <!--giphy_activity-->
-  <string name="giphy_activity_toolbar__search_gifs_and_stickers">Cerca GIF i adhesius</string>
-  <!--giphy_fragment-->
-  <string name="giphy_fragment__nothing_found">No s\'ha trobat res</string>
-  <!--log_submit_activity-->
+
+
+    <!--log_submit_activity-->
  <string name="log_submit_activity__log_fetch_failed">No s\'ha pogut llegir el registre del dispositiu. Podeu fer servir ADB per obtindre un registre de depuració.</string>
  <string name="log_submit_activity__thanks">Gràcies per ajudar-nos!</string>
  <string name="log_submit_activity__submitting">S\'està enviant</string>
@@ -293,12 +293,9 @@
  <!--GcmRefreshJob-->
  <string name="GcmRefreshJob_Permanent_Signal_communication_failure">Trvalá chyba komunikace Delta Chat!</string>
  <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Delta Chat se nemůže registrovat k službě Google Play. Zprávy a volání jsou proto zakázány: Prosím zkuste se znovu registrovat v menu Nastavení &gt; Rozšířené.</string>
-  <!--GiphyActivity-->
-  <string name="GiphyActivity_error_while_retrieving_full_resolution_gif">Chyba při získávání GIF v plném rozlišení</string>
-  <!--GiphyFragmentPageAdapter-->
-  <string name="GiphyFragmentPagerAdapter_gifs">GIFy</string>
-  <string name="GiphyFragmentPagerAdapter_stickers">Nálepky</string>
-  <!--GroupCreateActivity-->
+
+
+    <!--GroupCreateActivity-->
  <string name="GroupCreateActivity_actionbar_title">Nová skupina</string>
  <string name="GroupCreateActivity_actionbar_edit_title">Editovat skupinu</string>
  <string name="GroupCreateActivity_group_name_hint">Název skupiny</string>
@@ -769,11 +766,9 @@ Obdržen požadavek na výměnu klíčů pro neplatnou verzi protokolu.</string>
    <item quantity="many">%d ostatních</item>
    <item quantity="other">%d ostatních</item>
  </plurals>
-  <!--giphy_activity-->
-  <string name="giphy_activity_toolbar__search_gifs_and_stickers">Hledat GIFy an nálepky</string>
-  <!--giphy_fragment-->
-  <string name="giphy_fragment__nothing_found">Nenalezeno</string>
-  <!--log_submit_activity-->
+
+
+    <!--log_submit_activity-->
  <string name="log_submit_activity__log_fetch_failed">Na vašem zařízení nelze číst log. Můžete místo toho použít pro získání logu ADB.</string>
  <string name="log_submit_activity__thanks">Díky za Vaši pomoc!</string>
  <string name="log_submit_activity__submitting">Odesílání</string>
@@ -245,12 +245,9 @@
  <!--GcmRefreshJob-->
  <string name="GcmRefreshJob_Permanent_Signal_communication_failure">Permanent fejl i Delta Chat-kommunikationen!</string>
  <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Delta Chat var ude af stand til at registrere med Google Play Services. Delta Chat beskeder og opkald blev deaktiveret, prøv venligst at registrere igen i Indstillinger &gt; Advanceret.</string>
-  <!--GiphyActivity-->
-  <string name="GiphyActivity_error_while_retrieving_full_resolution_gif">Der skete en fejl i, mens vi hentede GIF i fuld opløsning.</string>
-  <!--GiphyFragmentPageAdapter-->
-  <string name="GiphyFragmentPagerAdapter_gifs">GIFs</string>
-  <string name="GiphyFragmentPagerAdapter_stickers">Klistermærke</string>
-  <!--GroupCreateActivity-->
+
+
+    <!--GroupCreateActivity-->
  <string name="GroupCreateActivity_actionbar_title">Ny gruppe</string>
  <string name="GroupCreateActivity_actionbar_edit_title">Rediger gruppe</string>
  <string name="GroupCreateActivity_group_name_hint">Gruppenavn</string>
@@ -649,11 +646,9 @@ Modtog en nøgle-besked for en ugyldig protokol-version.
    <item quantity="one">%d anden</item>
    <item quantity="other">%d andre</item>
  </plurals>
-  <!--giphy_activity-->
-  <string name="giphy_activity_toolbar__search_gifs_and_stickers">Søg i GIFs og klistermærker</string>
-  <!--giphy_fragment-->
-  <string name="giphy_fragment__nothing_found">Fandt ingenting</string>
-  <!--log_submit_activity-->
+
+
+    <!--log_submit_activity-->
  <string name="log_submit_activity__log_fetch_failed">Kunne ikke tilgå loggen på din enhed. Du kan alternativt benytte ADB for at få en debug log.</string>
  <string name="log_submit_activity__thanks">Tak for hjælpen!</string>
  <string name="log_submit_activity__submitting">Sender</string>
@@ -265,12 +265,9 @@
  <!--GcmRefreshJob-->
  <string name="GcmRefreshJob_Permanent_Signal_communication_failure">Dauerhafter Delta Chat-Kommunikationsfehler!</string>
  <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Delta Chat konnte nicht für die Google-Play-Dienste registriert werden. Delta Chat-Nachrichten und -Anrufe wurden daher deaktiviert. Bitte registriere Delta Chat im Menü »Einstellungen« &gt; »Weitere Einstellungen« erneut.</string>
-  <!--GiphyActivity-->
-  <string name="GiphyActivity_error_while_retrieving_full_resolution_gif">Fehler beim Abruf des GIFs in voller Auflösung</string>
-  <!--GiphyFragmentPageAdapter-->
-  <string name="GiphyFragmentPagerAdapter_gifs">GIFs</string>
-  <string name="GiphyFragmentPagerAdapter_stickers">Sticker</string>
-  <!--GroupCreateActivity-->
+
+
+    <!--GroupCreateActivity-->
  <string name="GroupCreateActivity_actionbar_title">Neue Gruppe</string>
  <string name="GroupCreateActivity_actionbar_edit_title">Gruppe bearbeiten</string>
  <string name="GroupCreateActivity_group_name_hint">Gruppenname</string>
@@ -718,11 +715,9 @@ Schlüsselaustausch-Nachricht für eine ungültige Protokollversion empfangen</s
    <item quantity="one">%d weiterer</item>
    <item quantity="other">%d weitere</item>
  </plurals>
-  <!--giphy_activity-->
-  <string name="giphy_activity_toolbar__search_gifs_and_stickers">GIFs und Sticker suchen</string>
-  <!--giphy_fragment-->
-  <string name="giphy_fragment__nothing_found">Nichts gefunden</string>
-  <!--log_submit_activity-->
+
+
+    <!--log_submit_activity-->
  <string name="log_submit_activity__log_fetch_failed">Das Diagnoseprotokoll auf deinem Gerät konnte nicht gelesen werden. Du kannst allerdings immer noch ADB verwenden, um ein Diagnoseprotokoll zu erhalten.</string>
  <string name="log_submit_activity__thanks">Danke für deine Hilfe!</string>
  <string name="log_submit_activity__submitting">Übermitteln</string>
@@ -265,12 +265,9 @@
  <!--GcmRefreshJob-->
  <string name="GcmRefreshJob_Permanent_Signal_communication_failure">Μόνιμη αποτυχία επικοινωνίας του Delta Chat!</string>
  <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Το Delta Chat δεν μπόρεσε να εγγραφτεί στις Υπηρεσίες Google Play. Τα μηνύματα και οι κλήσεις του Delta Chat έχουν απενεργοποιηθεί. Παρακαλώ προσπάθησε να επανεγγραφτείς στις Ρυθμίσεις &gt; Προχωρημένες Ρυθμίσεις.</string>
-  <!--GiphyActivity-->
-  <string name="GiphyActivity_error_while_retrieving_full_resolution_gif">Πρόβλημα κατά την ανάκτηση της πλήρους ανάλυσης της εικόνας GIF</string>
-  <!--GiphyFragmentPageAdapter-->
-  <string name="GiphyFragmentPagerAdapter_gifs">Εικόνες GIF</string>
-  <string name="GiphyFragmentPagerAdapter_stickers">Αυτοκόλλητα</string>
-  <!--GroupCreateActivity-->
+
+
+    <!--GroupCreateActivity-->
  <string name="GroupCreateActivity_actionbar_title">Νέα ομάδα</string>
  <string name="GroupCreateActivity_actionbar_edit_title">Επεξεργασία ομάδας</string>
  <string name="GroupCreateActivity_group_name_hint">Όνομα ομάδας</string>
@@ -722,11 +719,9 @@
    <item quantity="one">%d άλλος/η</item>
    <item quantity="other">%d άλλοι/ες</item>
  </plurals>
-  <!--giphy_activity-->
-  <string name="giphy_activity_toolbar__search_gifs_and_stickers">Αναζήτηση GIFs και αυτοκολλήτων</string>
-  <!--giphy_fragment-->
-  <string name="giphy_fragment__nothing_found">Δε βρέθηκε τίποτα</string>
-  <!--log_submit_activity-->
+
+
+    <!--log_submit_activity-->
  <string name="log_submit_activity__log_fetch_failed">Αποτυχία ανάγνωσης αρχείου καταγραφής συμβάντων για τη συσκευή σου. Μπορείς να χρησιμοποιήσεις το ADB για να πάρεις ένα αρχείο συμβάντων αποσφαλμάτωσης.</string>
  <string name="log_submit_activity__thanks">Ευχαριστούμε για τη βοήθειά σου!</string>
  <string name="log_submit_activity__submitting">Αποστολή</string>
@@ -277,12 +277,9 @@
  <!--GcmRefreshJob-->
  <string name="GcmRefreshJob_Permanent_Signal_communication_failure">¡Fallo permanente de comunicación de Delta Chat!</string>
  <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Delta Chat fué incapaz de registrarse con Google Play Services. Los mensajes y llamadas de Delta Chat han sido desactivados, por favor, intenta registrarte otra vez en Configuración &gt; Avanzado.</string>
-  <!--GiphyActivity-->
-  <string name="GiphyActivity_error_while_retrieving_full_resolution_gif">Error al obtener un GIF a resolución completa</string>
-  <!--GiphyFragmentPageAdapter-->
-  <string name="GiphyFragmentPagerAdapter_gifs">GIFs</string>
-  <string name="GiphyFragmentPagerAdapter_stickers">Pegatinas (stickers)</string>
-  <!--GroupCreateActivity-->
+
+
+    <!--GroupCreateActivity-->
  <string name="GroupCreateActivity_actionbar_title">Nuevo grupo</string>
  <string name="GroupCreateActivity_actionbar_edit_title">Editar grupo</string>
  <string name="GroupCreateActivity_group_name_hint">Nombre del grupo</string>
@@ -797,11 +794,9 @@ Se recibió un mensaje de intercambio de claves para una versión no válida del
    <item quantity="one">%d otro</item>
    <item quantity="other">%d otros</item>
  </plurals>
-  <!--giphy_activity-->
-  <string name="giphy_activity_toolbar__search_gifs_and_stickers">Buscar GIFs y pegatinas (stickers)</string>
-  <!--giphy_fragment-->
-  <string name="giphy_fragment__nothing_found">No se encontró nada</string>
-  <!--import_export_fragment-->
+
+
+    <!--import_export_fragment-->
  <!--log_submit_activity-->
  <string name="log_submit_activity__log_fetch_failed">No se pudo leer el registro (log) en su dispositivo. Aún puede usar ADB para obtener un registro de depuración en su lugar.</string>
  <string name="log_submit_activity__thanks">¡Gracias por su ayuda!</string>
@@ -265,12 +265,9 @@
  <!--GcmRefreshJob-->
  <string name="GcmRefreshJob_Permanent_Signal_communication_failure">Püsiv Signali ühendusviga!</string>
  <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Delta Chat ei saanud registreerida teenusega Google Play Services. Signali sõnumid ja kõned on keelatud, palun proovi taas-registreerida menüüs Seaded &gt; Täpsem.</string>
-  <!--GiphyActivity-->
-  <string name="GiphyActivity_error_while_retrieving_full_resolution_gif">Täisresolutsiooniga GIFi vastuvõtmisel esines viga</string>
-  <!--GiphyFragmentPageAdapter-->
-  <string name="GiphyFragmentPagerAdapter_gifs">GIFid</string>
-  <string name="GiphyFragmentPagerAdapter_stickers">Kleepsud</string>
-  <!--GroupCreateActivity-->
+
+
+    <!--GroupCreateActivity-->
  <string name="GroupCreateActivity_actionbar_title">Uus grupp</string>
  <string name="GroupCreateActivity_actionbar_edit_title">Muuda gruppi</string>
  <string name="GroupCreateActivity_group_name_hint">Grupi nimi</string>
@@ -729,11 +726,9 @@
    <item quantity="one">%d teine</item>
    <item quantity="other">%d teist</item>
  </plurals>
-  <!--giphy_activity-->
-  <string name="giphy_activity_toolbar__search_gifs_and_stickers">Otsi GIFe ja kleepse</string>
-  <!--giphy_fragment-->
-  <string name="giphy_fragment__nothing_found">Midagi ei leitud</string>
-  <!--log_submit_activity-->
+
+
+    <!--log_submit_activity-->
  <string name="log_submit_activity__log_fetch_failed">Ei saanud sinu seadmes lugeda logi. Sa võid siiski kasutada ADB-d, et saada selle asemel silumislogi.</string>
  <string name="log_submit_activity__thanks">Täname abi eest!</string>
  <string name="log_submit_activity__submitting">Saatmine</string>
@@ -266,12 +266,9 @@
  <!--GcmRefreshJob-->
  <string name="GcmRefreshJob_Permanent_Signal_communication_failure">Delta Chat behin betiko komunikazio hutsegitea!</string>
  <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Delta Chat ez da gai izan Google Play Zerbitzuekin erregistratzeko. Delta Chat mezu eta deiak desgaitu egin dira, mesedez saiatu bererregistratzen Ezarpenak &gt; Aurreratua menuan.</string>
-  <!--GiphyActivity-->
-  <string name="GiphyActivity_error_while_retrieving_full_resolution_gif">Errorea bereizmen osoko GIFa eskuratzerakoan</string>
-  <!--GiphyFragmentPageAdapter-->
-  <string name="GiphyFragmentPagerAdapter_gifs">GIFak</string>
-  <string name="GiphyFragmentPagerAdapter_stickers">Eranskailuak</string>
-  <!--GroupCreateActivity-->
+
+
+    <!--GroupCreateActivity-->
  <string name="GroupCreateActivity_actionbar_title">Talde berria</string>
  <string name="GroupCreateActivity_actionbar_edit_title">Taldea editatu</string>
  <string name="GroupCreateActivity_group_name_hint">Taldearen izena</string>
@@ -727,11 +724,9 @@ Gakoaren elkar-trukeraro mezua jaso da protokoloaren bertsio baliogabe baterako.
    <item quantity="one">%d gehiago</item>
    <item quantity="other">%d gehiago</item>
  </plurals>
-  <!--giphy_activity-->
-  <string name="giphy_activity_toolbar__search_gifs_and_stickers">GIF eta eranskailuak bilatu</string>
-  <!--giphy_fragment-->
-  <string name="giphy_fragment__nothing_found">Ez da ezer aurkitu</string>
-  <!--log_submit_activity-->
+
+
+    <!--log_submit_activity-->
  <string name="log_submit_activity__log_fetch_failed">Ezin izan da gailuko erregistroa irakurri.  Dena den, ordenagailuko ADB programa erabil dezakezu arazketa-erregistroa eskuratzeko.</string>
  <string name="log_submit_activity__thanks">Eskerrik asko zure laguntzagatik!</string>
  <string name="log_submit_activity__submitting">Bidaltzen</string>
@@ -247,12 +247,9 @@
  <!--GcmRefreshJob-->
  <string name="GcmRefreshJob_Permanent_Signal_communication_failure">ارتباط سیگنال بطور کل قطع شده است</string>
  <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">نرم‌افزار سیگنال نمی‌تواند از طریق خدمات Google Play، شما را ثبت‌نام کند. پیام‌ها و تماس‌های سیگنال، غیرفعال شده‌اند، لطفاً تلاش کنید از طریق تنظیمات مجدداً ثبت‌نام کنید.</string>
-  <!--GiphyActivity-->
-  <string name="GiphyActivity_error_while_retrieving_full_resolution_gif">خطا در هنگام دریافت GIF با کیفیت کامل</string>
-  <!--GiphyFragmentPageAdapter-->
-  <string name="GiphyFragmentPagerAdapter_gifs">گیف ها</string>
-  <string name="GiphyFragmentPagerAdapter_stickers">استیکر ها</string>
-  <!--GroupCreateActivity-->
+
+
+    <!--GroupCreateActivity-->
  <string name="GroupCreateActivity_actionbar_title">گروه جدید</string>
  <string name="GroupCreateActivity_actionbar_edit_title">ویرایش گروه</string>
  <string name="GroupCreateActivity_group_name_hint">نام گروه</string>
@@ -625,11 +622,9 @@
    <item quantity="one">%d دیگران</item>
    <item quantity="other">%d دیگران</item>
  </plurals>
-  <!--giphy_activity-->
-  <string name="giphy_activity_toolbar__search_gifs_and_stickers">جست‌وجوی فایل گیف و استیکر</string>
-  <!--giphy_fragment-->
-  <string name="giphy_fragment__nothing_found">چیزی یافت نشد</string>
-  <!--log_submit_activity-->
+
+
+    <!--log_submit_activity-->
  <string name="log_submit_activity__log_fetch_failed">نمی توانیم فایل گزارش را در دستگاه شما بخوانیم.شما می توانید از طریق ADB گزارش دیباگ را دریافت کنید.</string>
  <string name="log_submit_activity__thanks">تشکر از کمک شما!</string>
  <string name="log_submit_activity__submitting">ارسال</string>
@@ -265,12 +265,9 @@
  <!--GcmRefreshJob-->
  <string name="GcmRefreshJob_Permanent_Signal_communication_failure">Pysyvä Delta Chat-yhteysvirhe!</string>
  <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Delta Chat ei voinut rekisteröityä Google Play Services -palveluun, minkä vuoksi Delta Chat-viestit ja puhelut ovat otettu pois käytöstä. Kokeile rekisteröityä uudelleen Signalin lisäasetuksista.</string>
-  <!--GiphyActivity-->
-  <string name="GiphyActivity_error_while_retrieving_full_resolution_gif">Täysikokoisen GIFin lataaminen epäonnistui</string>
-  <!--GiphyFragmentPageAdapter-->
-  <string name="GiphyFragmentPagerAdapter_gifs">GIFit</string>
-  <string name="GiphyFragmentPagerAdapter_stickers">Tarrat</string>
-  <!--GroupCreateActivity-->
+
+
+    <!--GroupCreateActivity-->
  <string name="GroupCreateActivity_actionbar_title">Uusi ryhmä</string>
  <string name="GroupCreateActivity_actionbar_edit_title">Muokkaa ryhmää</string>
  <string name="GroupCreateActivity_group_name_hint">Ryhmän nimi</string>
@@ -723,11 +720,9 @@ Vastaanotetiin avaintenvaihtoviesti, joka kuuluu väärälle protokollaversiolle
    <item quantity="one">%d muu</item>
    <item quantity="other">%d muuta</item>
  </plurals>
-  <!--giphy_activity-->
-  <string name="giphy_activity_toolbar__search_gifs_and_stickers">Etsi GIFejä ja tarroja</string>
-  <!--giphy_fragment-->
-  <string name="giphy_fragment__nothing_found">Mitään ei löytynyt</string>
-  <!--log_submit_activity-->
+
+
+    <!--log_submit_activity-->
  <string name="log_submit_activity__log_fetch_failed">Lokin lukeminen laitteestasi epäonnistui. Voit sen sijaan käyttää ADB-työkalua virheenkorjauslokin noutamiseen.</string>
  <string name="log_submit_activity__thanks">Kiitos avustasi!</string>
  <string name="log_submit_activity__submitting">Lähetetään</string>
--- a/Show More
+++ b/Show More