Update messenger-backend submodule.

bump version
wording
2026-07-03 14:05:24 +02:00 · 2017-12-15 01:04:56 +01:00 · 2017-12-15 01:02:46 +01:00 · 2017-12-15 00:05:37 +01:00 · 2017-12-14 23:59:26 +01:00 · 2017-12-14 23:59:07 +01:00
376 changed files with 8917 additions and 18990 deletions
@@ -0,0 +1,23 @@
+# Thank you for contributing to Delta Chat.
+
+Delta Chat is divided in two parts: Android and [Core](https://github.com/deltachat/deltachat-core).
+
+In short, the Android part is about the User Interface. The Interface is translated using [Transifex](https://www.transifex.com/delta-chat/delta-chat-android). The Core part is about handling the connection to the mail server and the chat or e-mail messages as well as providing secure communication by using [Autocrypt](https://autocrypt.org/en/latest/).
+
+Delta Chat Core is used in the Android and in the [iOS](https://github.com/deltachat/deltachat-ios) version.
+
+Please try to create your issue to the respective Issue tracker: Here, or in [Core](https://github.com/deltachat/deltachat-core/issues). Don't worry, if you are not sure. We will move the issue if necessary.
+
+If you intend to create a **feature request** for Delta Chat, please check the exiting requests for
+* [Android](https://github.com/deltachat/deltachat-android/issues?q=is%3Aissue+label%3A%22feature+request%22+sort%3Aupdated-desc) and
+* [Core](https://github.com/deltachat/deltachat-core/issues?q=is%3Aissue+label%3A%22feature+request%22+sort%3Aupdated-desc) 
+
+first.
+
+If you intend to send a **bug report** for Delta Chat, search for bugs (including closed) in
+* [Android](https://github.com/deltachat/deltachat-android/issues?&q=is%3Aissue) and
+* [Core](https://github.com/deltachat/deltachat-core/issues?&q=is%3Aissue)
+
+A **bug** is a reproducable misbehaviour, when something happens but something else should happen instead. 
+
+Did you know there is a [Help](https://delta.chat/en/help) page for Delta Chat?
@@ -0,0 +1,34 @@
+_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 that is not applicable._
+
+**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**
+
+If applicable, debug logs can be copied from within the Delta Chat app: 
+
+Open the _Settings_ menu -> _About_ -> _version number|Info_.
+
+Alternatively from the Android system log:
+
+` 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.
@@ -9,3 +9,7 @@ libs/

 # ignore private scripts and directories, eg. local2github.prv.sh
 *.prv*
+
+# transifex temporary files
+tools/.tx/
+tools/translations/
@@ -1,5 +1,127 @@
 # Delta Chat Changelog

+## v0.11.1
+2017-12-14
+
+* Add option to initiate Autocrypt Key Transfer
+* Connect after importing a backup
+* Add Albanian translation
+* Update German, Italian, Polish and Russian translations
+
+## v0.10.0
+2017-11-29
+
+* Fix usage of multiple private keys
+* Fix various memory leaks
+* Update English, Portuguese and Turkish translations
+
+## v0.9.9
+2017-11-18
+
+* Alternate include order for F-Droid
+* Add Serbian translation
+* Update Catalan, Dutch, English, French, German, Hungarian, Italian, Polish, Portuguese, Russian, Spanish, Tamil, Telugu and Ukrainian translations
+
+## v0.9.8
+2017-11-15
+
+* Fix a bug that avoids chat creation under some circumstances (bug introduced in 0.9.7)
+
+## v0.9.7
+2017-11-14
+
+* Archive chats or delete chats by a long press
+* Notify the user in the chatlist about contact requests of known users or of other Delta Chat clients
+* Show messages only for explicitly wanted chats
+* Show more detailed reasons about failed end-to-end-encryptions
+* Explicit option to leave a group
+* Do not show the padlock if end-to-end-encryption is disabled by the user
+* Also import images from a backup when using a different device with different paths
+* Add copy-to-clipboard function for "About / Info"
+* Rework Emoji-code
+* Add Norwegian Bokmål translation
+* Add Tamil translation
+* Add Turkish translation
+* Update Catalan, German, French, Italian, Korean, Dutch, Polish, Portuguese, Russian, Telugu and Ukrainian translations
+
+## v0.9.6
+2017-10-18
+
+* Support keys generated with multiple subkeys eg. from K-9
+* Show PDFs and other attachments with bad names
+* Bug fixes
+
+## v0.9.5
+2017-10-08
+
+* Backup export and import function
+* Query password before export
+* Move replies from normal E-Mail-Clients to the "Chats" folder
+* Improve helping MUAs on showing chat threads
+* Improve onboarding
+* Add URL to default footer
+* Test a different approach for battery saving in this release
+* Update French, Italian, German, Polish, Portuguese, Russian and Ukrainian translations
+
+## v0.9.4
+2017-08-23
+
+* Introduce an editable "Status" field that is shown eg. in email footers
+* Editable and synchronized group images
+* Show the subject of messages that cannot be decrypted
+* Do not send "Read receipts" when decryption fails
+* Do not request "Read receipts" from normal MUAs as there are too many MUAs responding with weird, non-standard formats
+* Deleting a chat always deletes all messages from the device permanently
+* Ignore messages from mailing lists
+* Do not spread the original authors name nor address on forwarding
+* Encrypt mails send to SMTP and to IMAP the same way
+* Improve showing HTML-mails
+* Cleanup Android code
+* Remove badge counter on app restart
+* Add Ukrainian translation
+* Add Telugu translation
+* Add Catalan translation
+* Update German, Spanish, French, Hungarian, Italian, Polish, Portuguese and Russian translations
+
+## v0.9.3
+2017-07-13
+
+* Introduce "Read receipts" and avoid social pressure to leave it activated
+* Improve encryption dialog in profile
+* Fix marking messages as "seen" when opening the contact requests
+* Ignore signature.asc files of signed-only messages
+* Update Polish, Portuguese and Russian translations
+
+## v0.9.2
+2017-06-28
+
+* Encrypt group chats
+* Cryptographically sign messages
+* Validate signatures of incoming messages ("Info" shows the state)
+* Show a little lock beside end-to-end-encrypted messages with a validated signature
+* If end-to-end-encryption is available on sending time, guarantee the message not to be sent without end-to-end-encryption later
+* Show special characters in HTML-mails
+* Help MUAs on showing chat threads
+* Show attachments from multipart/alternative structures
+* Upgrade from Autocrypt Level 0 to Level 1; as the levels are not compatible, encryption on mixed setups does not happen
+* Update Polish, Portuguese, Spanish and French translations
+
+## v0.9.1
+2017-06-04
+
+* Profile: Improve encryption state dialog
+* Improved video quality of short clips
+* Make encryption-dialog localizable
+* Update Russian translation
+
+## v0.9.0
+2017-06-01
+
+* Add end-to-end-encrypting following the OpenPGP and Autocrypt standards
+* Add a function to compare keys
+* Profile: Add option to copy the email address to the clipboard
+* Pimp GUI
+
 ## v0.1.36
 2017-05-04

@@ -48,7 +48,10 @@ android {

    signingConfigs {
        debug {
-            storeFile file("config/debug.keystore")
+            def debugKeystore = file("config/debug.keystore")
+            if (debugKeystore.exists()) {
+                storeFile debugKeystore
+            }
        }

        release {
@@ -76,13 +79,12 @@ android {
        }
    }

-    defaultConfig.versionCode = 36
-
    sourceSets.main {
        jniLibs.srcDir 'libs'
        jni.srcDirs = [] //disable automatic ndk-build call
    }

+    flavorDimensions "none"
    productFlavors {
        /*
        x86 {
@@ -105,19 +107,22 @@ android {
        }
        */
        fat {
-            versionCode = 3
+            dimension "none"
+            //versionCode = 3
        }
    }

-    applicationVariants.all { variant ->
+    /*applicationVariants.all { variant ->
        def abiVersion = variant.productFlavors.get(0).versionCode
        variant.mergedFlavor.versionCode = defaultConfig.versionCode * 10 + abiVersion;
-    }
+    }*/

    defaultConfig {
        minSdkVersion 14     // 14: Android 4.0 Ice Cream Sandwich 2011 (Telegram default), 21: Android 5.0 Lollipop 2014 (recommended for InstantRun)
        targetSdkVersion 25  // 25: Nougat. CAVE: Do NOT target "Andoid O" without checking the background tasks carefully, see https://developer.android.com/preview/behavior-changes.html#back-all . As long as we target "Nougat", everything works as expected even for "Andoid O" or later
                             // in general, we should not change the target without reason; eg. after the switch to Nougat, the camera stops working (see https://inthecheesefactory.com/blog/how-to-share-access-to-file-with-fileprovider-on-android-nougat/en )
-        versionName "0.1.36" // do NOT forget to increase defaultConfig.versionCode!
+
+        versionName "0.11.1" // do NOT forget to increase defaultConfig.versionCode!
+        versionCode 506
    }
 }
@@ -493,6 +493,19 @@ local_src_files := \
 	./openssl/crypto/buffer/buf_err.c \
 	./openssl/crypto/buffer/buf_str.c \
 	./openssl/crypto/buffer/buffer.c \
+	./openssl/crypto/camellia/camellia.c \
+	./openssl/crypto/camellia/cmll_cbc.c \
+	./openssl/crypto/camellia/cmll_cfb.c \
+	./openssl/crypto/camellia/cmll_ctr.c \
+	./openssl/crypto/camellia/cmll_ecb.c \
+	./openssl/crypto/camellia/cmll_misc.c \
+	./openssl/crypto/camellia/cmll_ofb.c \
+	./openssl/crypto/camellia/cmll_utl.c \
+	./openssl/crypto/cast/c_cfb64.c \
+	./openssl/crypto/cast/c_ecb.c \
+	./openssl/crypto/cast/c_enc.c \
+	./openssl/crypto/cast/c_ofb64.c \
+	./openssl/crypto/cast/c_skey.c \
 	./openssl/crypto/cmac/cm_ameth.c \
 	./openssl/crypto/cmac/cm_pmeth.c \
 	./openssl/crypto/cmac/cmac.c \
@@ -610,6 +623,8 @@ local_src_files := \
 	./openssl/crypto/evp/e_aes.c \
 	./openssl/crypto/evp/e_aes_cbc_hmac_sha1.c \
 	./openssl/crypto/evp/e_bf.c \
+	./openssl/crypto/evp/e_camellia.c \
+	./openssl/crypto/evp/e_cast.c \
 	./openssl/crypto/evp/e_des.c \
 	./openssl/crypto/evp/e_des3.c \
 	./openssl/crypto/evp/e_null.c \
@@ -1188,6 +1203,7 @@ LOCAL_SRC_FILES := \
 	./messenger-backend/libs/libetpan/src/low-level/smtp/mailsmtp_ssl.c \
 	./messenger-backend/libs/libetpan/src/main/libetpan_version.c \
 	./messenger-backend/libs/libetpan/src/driver/implementation/data-message/data_message_driver.c \
+	./messenger-backend/libs/libetpan/src/driver/implementation/mime-message/mime_message_driver.c \
 	./messenger-backend/libs/libetpan/src/driver/interface/maildriver.c \
 	./messenger-backend/libs/libetpan/src/driver/interface/maildriver_tools.c \
 	./messenger-backend/libs/libetpan/src/driver/interface/maildriver_types.c \
@@ -1197,7 +1213,9 @@ LOCAL_SRC_FILES := \
 	./messenger-backend/libs/libetpan/src/driver/interface/mailmessage_tools.c \
 	./messenger-backend/libs/libetpan/src/driver/interface/mailmessage_types.c \
 	./messenger-backend/libs/libetpan/src/driver/interface/mailstorage.c \
-	./messenger-backend/libs/libetpan/src/driver/interface/mailstorage_tools.c
+	./messenger-backend/libs/libetpan/src/driver/interface/mailstorage_tools.c \
+	./messenger-backend/libs/libetpan/src/engine/mailprivacy.c \
+	./messenger-backend/libs/libetpan/src/engine/mailprivacy_tools.c
 LOCAL_C_INCLUDES = \
 	$(LOCAL_PATH)/messenger-backend/libs/libetpan/src \
 	$(LOCAL_PATH)/messenger-backend/libs/libetpan/src/data-types \
@@ -1220,7 +1238,6 @@ LOCAL_C_INCLUDES = \
 include $(BUILD_STATIC_LIBRARY)


-
 ################################################################################
 # cyrus sasl
 ################################################################################
@@ -1294,6 +1311,7 @@ LOCAL_MODULE := sqlite
 LOCAL_CFLAGS 	:= -w -std=c11 -Os -DNULL=0 -DSOCKLEN_T=socklen_t -DLOCALE_NOT_USED -D_LARGEFILE_SOURCE=1 -D_FILE_OFFSET_BITS=64
 LOCAL_CFLAGS 	+= -DANDROID_NDK -DDISABLE_IMPORTGL -fno-strict-aliasing -fprefetch-loop-arrays -DAVOID_TABLES -DANDROID_TILE_BASED_DECODE -DANDROID_ARMV6_IDCT -DHAVE_STRCHRNUL=0
 LOCAL_CFLAGS 	+= -DSQLITE_OMIT_LOAD_EXTENSION
+LOCAL_CFLAGS 	+= -DSQLITE_MAX_MMAP_SIZE=0 -DSQLITE_OMIT_WAL  # HACK: the defines are used to skip the pointer reference to mmap set in aSyscall[] - mmap seems to be a #define that cannot be used this way on Android - otherwise we get the error: 'mmap' undeclared here (not in a function)

 LOCAL_SRC_FILES     := \
 ./messenger-backend/libs/sqlite/sqlite3.c
@@ -1492,6 +1510,7 @@ $(LOCAL_PATH)/breakpad/common/android/include \
 $(LOCAL_PATH)/breakpad \
 $(LOCAL_PATH)/ffmpeg \
 $(LOCAL_PATH)/messenger-backend/libs/libetpan/include \
+$(LOCAL_PATH)/messenger-backend/libs/netpgp/include \
 $(LOCAL_PATH)/messenger-backend/libs/sqlite

 #LOCAL_SRC_FILES     += \
@@ -1599,28 +1618,51 @@ LOCAL_SRC_FILES     += \
 ./image.c \
 ./video.c \
 ./gifvideo.cpp \
+./messenger-backend/libs/netpgp/src/compress.c \
+./messenger-backend/libs/netpgp/src/create.c \
+./messenger-backend/libs/netpgp/src/crypto.c \
+./messenger-backend/libs/netpgp/src/keyring.c \
+./messenger-backend/libs/netpgp/src/misc.c \
+./messenger-backend/libs/netpgp/src/openssl_crypto.c \
+./messenger-backend/libs/netpgp/src/packet-parse.c \
+./messenger-backend/libs/netpgp/src/packet-show.c \
+./messenger-backend/libs/netpgp/src/reader.c \
+./messenger-backend/libs/netpgp/src/signature.c \
+./messenger-backend/libs/netpgp/src/symmetric.c \
+./messenger-backend/libs/netpgp/src/validate.c \
+./messenger-backend/libs/netpgp/src/writer.c \
+./messenger-backend/src/mraheader.c \
+./messenger-backend/src/mrapeerstate.c \
+./messenger-backend/src/mrarray.c \
 ./messenger-backend/src/mrchat.c \
 ./messenger-backend/src/mrchatlist.c \
-./messenger-backend/src/mrcmdline.c \
 ./messenger-backend/src/mrcontact.c \
-./messenger-backend/src/mre2ee.c \
+./messenger-backend/src/mrdehtml.c \
+./messenger-backend/src/mrhash.c \
 ./messenger-backend/src/mrimap.c \
 ./messenger-backend/src/mrjob.c \
+./messenger-backend/src/mrkey.c \
+./messenger-backend/src/mrkeyring.c \
 ./messenger-backend/src/mrloginparam.c \
+./messenger-backend/src/mrlot.c \
 ./messenger-backend/src/mrmailbox.c \
 ./messenger-backend/src/mrmailbox_configure.c \
+./messenger-backend/src/mrmailbox_e2ee.c \
+./messenger-backend/src/mrmailbox_imex.c \
 ./messenger-backend/src/mrmailbox_log.c \
+./messenger-backend/src/mrmailbox_tools.c \
+./messenger-backend/src/mrmimefactory.c \
 ./messenger-backend/src/mrmimeparser.c \
 ./messenger-backend/src/mrmsg.c \
-./messenger-backend/src/mrosnative.c \
 ./messenger-backend/src/mrparam.c \
-./messenger-backend/src/mrpoortext.c \
+./messenger-backend/src/mrpgp.c \
 ./messenger-backend/src/mrsaxparser.c \
 ./messenger-backend/src/mrsimplify.c \
 ./messenger-backend/src/mrsmtp.c \
 ./messenger-backend/src/mrsqlite3.c \
 ./messenger-backend/src/mrstock.c \
 ./messenger-backend/src/mrtools.c \
+./messenger-backend/cmdline/cmdline.c \
 ./mrwrapper.c

 include $(BUILD_SHARED_LIBRARY)
@@ -1,4 +1,4 @@
-APP_PLATFORM := android-9
+APP_PLATFORM := android-14
 APP_ABI := armeabi armeabi-v7a x86
 NDK_TOOLCHAIN_VERSION := 4.9
 APP_STL := gnustl_static
@@ -1,6 +1,6 @@
 /*******************************************************************************
 *
- *                          Messenger Android Frontend
+ *                              Delta Chat Android
 *                        (C) 2013-2016 Nikolai Kudashov
 *                           (C) 2017 Björn Petersen
 *                    Contact: r10s@b44t.com, http://b44t.com
@@ -1,6 +1,6 @@
 /*******************************************************************************
 *
- *                          Messenger Android Frontend
+ *                              Delta Chat Android
 *                        (C) 2013-2016 Nikolai Kudashov
 *                           (C) 2017 Björn Petersen
 *                    Contact: r10s@b44t.com, http://b44t.com
@@ -1,6 +1,6 @@
 /*******************************************************************************
 *
- *                          Messenger Android Frontend
+ *                              Delta Chat Android
 *                        (C) 2013-2016 Nikolai Kudashov
 *                           (C) 2017 Björn Petersen
 *                    Contact: r10s@b44t.com, http://b44t.com
@@ -1,6 +1,6 @@
 /*******************************************************************************
 *
- *                          Messenger Android Frontend
+ *                              Delta Chat Android
 *                        (C) 2013-2016 Nikolai Kudashov
 *                           (C) 2017 Björn Petersen
 *                    Contact: r10s@b44t.com, http://b44t.com
@@ -1,6 +1,6 @@
 /*******************************************************************************
 *
- *                          Messenger Android Frontend
+ *                              Delta Chat Android
 *                        (C) 2013-2016 Nikolai Kudashov
 *                           (C) 2017 Björn Petersen
 *                    Contact: r10s@b44t.com, http://b44t.com
@@ -1,6 +1,6 @@
 /*******************************************************************************
 *
- *                          Messenger Android Frontend
+ *                              Delta Chat Android
 *                        (C) 2013-2016 Nikolai Kudashov
 *                           (C) 2017 Björn Petersen
 *                    Contact: r10s@b44t.com, http://b44t.com
@@ -1,6 +1,6 @@
 /*******************************************************************************
 *
- *                          Messenger Android Frontend
+ *                              Delta Chat Android
 *                        (C) 2013-2016 Nikolai Kudashov
 *                           (C) 2017 Björn Petersen
 *                    Contact: r10s@b44t.com, http://b44t.com
@@ -1,6 +1,6 @@
 /*******************************************************************************
 *
- *                          Messenger Android Frontend
+ *                              Delta Chat Android
 *                           (C) 2017 Björn Petersen
 *                    Contact: r10s@b44t.com, http://b44t.com
 *
@@ -28,6 +28,7 @@
 #include <jni.h>
 #include <android/log.h>
 #include "messenger-backend/src/mrmailbox.h"
+#include "messenger-backend/cmdline/cmdline.h"


 #define CHAR_REF(a) \
@@ -116,15 +117,15 @@ void mrosnative_unsetup_thread(mrmailbox_t* mailbox)

 /* tools */

-static jintArray carray2jintArray_n_carray_free(JNIEnv *env, const carray* ca)
+static jintArray mrarray2jintArray_n_mrarray_unref(JNIEnv *env, const mrarray_t* ca)
 {
-	int i, icnt = ca? carray_count(ca) : 0;
+	int i, icnt = ca? mrarray_get_cnt(ca) : 0;
 	jintArray ret = (*env)->NewIntArray(env, icnt); if (ret == NULL) { return NULL; }
 	
 	if( ca ) {
 		if( icnt ) {
-			void** ca_data = carray_data(ca);
-			if( sizeof(void*)==sizeof(jint) ) {
+			uintptr_t* ca_data = ca->m_array;
+			if( sizeof(uintptr_t)==sizeof(jint) ) {
 				(*env)->SetIntArrayRegion(env, ret, 0, icnt, (jint*)ca_data);
 			}
 			else {
@@ -136,7 +137,7 @@ static jintArray carray2jintArray_n_carray_free(JNIEnv *env, const carray* ca)
 				free(temp);
 			}
 		}
-		carray_free(ca);
+		mrarray_unref(ca);
 	}

 	return ret;
@@ -223,7 +224,7 @@ static uintptr_t s_mailbox_callback_(mrmailbox_t* mailbox, int event, uintptr_t
 JNIEXPORT jlong Java_com_b44t_messenger_MrMailbox_MrMailboxNew(JNIEnv *env, jclass c)
 {
 	s_init_globals(env, c);
-	return (jlong)mrmailbox_new(s_mailbox_callback_, NULL);
+	return (jlong)mrmailbox_new(s_mailbox_callback_, NULL, "Android");
 }


@@ -246,20 +247,20 @@ JNIEXPORT void Java_com_b44t_messenger_MrMailbox_close(JNIEnv *env, jclass cls)

 JNIEXPORT jstring Java_com_b44t_messenger_MrMailbox_getBlobdir(JNIEnv *env, jclass cls)
 {
-	mrmailbox_t* ths = get_mrmailbox_t(env, cls);
-	return JSTRING_NEW((ths&&ths->m_blobdir)? ths->m_blobdir : NULL);
+	mrmailbox_t* ths = get_mrmailbox_t(env, cls); if( ths == NULL ) { return JSTRING_NEW(NULL); }
+	return JSTRING_NEW(ths->m_blobdir);
 }


-JNIEXPORT void Java_com_b44t_messenger_MrMailbox_configureAndConnect(JNIEnv *env, jclass cls)
+JNIEXPORT jint Java_com_b44t_messenger_MrMailbox_configureAndConnect(JNIEnv *env, jclass cls)
 {
-	mrmailbox_configure_and_connect(get_mrmailbox_t(env, cls));
+	return (jint)mrmailbox_configure_and_connect(get_mrmailbox_t(env, cls));
 }


-JNIEXPORT void Java_com_b44t_messenger_MrMailbox_configureCancel(JNIEnv *env, jclass cls)
+JNIEXPORT void Java_com_b44t_messenger_MrMailbox_stopOngoingProcess(JNIEnv *env, jclass cls)
 {
-	mrmailbox_configure_cancel(get_mrmailbox_t(env, cls));
+	mrmailbox_stop_ongoing_process(get_mrmailbox_t(env, cls));
 }


@@ -286,9 +287,9 @@ JNIEXPORT void Java_com_b44t_messenger_MrMailbox_disconnect(JNIEnv *env, jclass
 JNIEXPORT jintArray Java_com_b44t_messenger_MrMailbox_getKnownContacts(JNIEnv *env, jclass cls, jstring query)
 {
 	CHAR_REF(query);
-	    carray* ca = mrmailbox_get_known_contacts(get_mrmailbox_t(env, cls), queryPtr);
+	    mrarray_t* ca = mrmailbox_get_known_contacts(get_mrmailbox_t(env, cls), queryPtr);
 	CHAR_UNREF(query);
-	return carray2jintArray_n_carray_free(env, ca);
+	return mrarray2jintArray_n_mrarray_unref(env, ca);
 }


@@ -300,8 +301,8 @@ JNIEXPORT jint Java_com_b44t_messenger_MrMailbox_getBlockedCount(JNIEnv *env, jc

 JNIEXPORT jintArray Java_com_b44t_messenger_MrMailbox_getBlockedContacts(JNIEnv *env, jclass cls)
 {
-	carray* ca = mrmailbox_get_blocked_contacts(get_mrmailbox_t(env, cls));
-	return carray2jintArray_n_carray_free(env, ca);
+	mrarray_t* ca = mrmailbox_get_blocked_contacts(get_mrmailbox_t(env, cls));
+	return mrarray2jintArray_n_mrarray_unref(env, ca);
 }


@@ -322,9 +323,9 @@ JNIEXPORT jint Java_com_b44t_messenger_MrMailbox_MrMailboxCreateContact(JNIEnv *
 }


-JNIEXPORT jint Java_com_b44t_messenger_MrMailbox_MrMailboxBlockContact(JNIEnv *env, jclass c, jlong hMailbox, jint contact_id, jint block)
+JNIEXPORT void Java_com_b44t_messenger_MrMailbox_MrMailboxBlockContact(JNIEnv *env, jclass c, jlong hMailbox, jint contact_id, jint block)
 {
-	return (jint)mrmailbox_block_contact((mrmailbox_t*)hMailbox, contact_id, block);
+	mrmailbox_block_contact((mrmailbox_t*)hMailbox, contact_id, block);
 }


@@ -336,16 +337,16 @@ JNIEXPORT jint Java_com_b44t_messenger_MrMailbox_MrMailboxDeleteContact(JNIEnv *

 /* MrMailbox - handle chats */

-JNIEXPORT jlong Java_com_b44t_messenger_MrMailbox_MrMailboxGetChatlist(JNIEnv *env, jclass c, jlong hMailbox, jstring query)
+JNIEXPORT jlong Java_com_b44t_messenger_MrMailbox_MrMailboxGetChatlist(JNIEnv *env, jclass c, jlong hMailbox, jint listflags, jstring query)
 {
 	jlong ret;
 	if( query ) {
 		CHAR_REF(query);
-			ret = (jlong)mrmailbox_get_chatlist((mrmailbox_t*)hMailbox, queryPtr);
+			ret = (jlong)mrmailbox_get_chatlist((mrmailbox_t*)hMailbox, listflags, queryPtr);
 		CHAR_UNREF(query);
 	}
 	else {
-		ret = (jlong)mrmailbox_get_chatlist((mrmailbox_t*)hMailbox, NULL);
+		ret = (jlong)mrmailbox_get_chatlist((mrmailbox_t*)hMailbox, listflags, NULL);
 	}
 	return ret;
 }
@@ -363,15 +364,30 @@ JNIEXPORT jint Java_com_b44t_messenger_MrMailbox_getChatIdByContactId(JNIEnv *en
 }


-JNIEXPORT jint Java_com_b44t_messenger_MrMailbox_markseenMsg(JNIEnv *env, jclass cls, jint msg_id)
+JNIEXPORT void Java_com_b44t_messenger_MrMailbox_markseenMsgs(JNIEnv *env, jclass cls, jintArray msg_ids)
 {
-	return (jint)mrmailbox_markseen_msg(get_mrmailbox_t(env, cls), msg_id);
+	int msg_ids_cnt;
+	const uint32_t* msg_ids_ptr = jintArray2uint32Pointer(env, msg_ids, &msg_ids_cnt);
+		mrmailbox_markseen_msgs(get_mrmailbox_t(env, cls), msg_ids_ptr, msg_ids_cnt);
+	free(msg_ids_ptr);
 }


-JNIEXPORT jint Java_com_b44t_messenger_MrMailbox_markseenChat(JNIEnv *env, jclass cls, jint chat_id)
+JNIEXPORT void Java_com_b44t_messenger_MrMailbox_marknoticedChat(JNIEnv *env, jclass cls, jint chat_id)
 {
-	return (jlong)mrmailbox_markseen_chat(get_mrmailbox_t(env, cls), chat_id);
+	mrmailbox_marknoticed_chat(get_mrmailbox_t(env, cls), chat_id);
+}
+
+
+JNIEXPORT void Java_com_b44t_messenger_MrMailbox_marknoticedContact(JNIEnv *env, jclass cls, jint contact_id)
+{
+	mrmailbox_marknoticed_contact(get_mrmailbox_t(env, cls), contact_id);
+}
+
+
+JNIEXPORT void Java_com_b44t_messenger_MrMailbox_archiveChat(JNIEnv *env, jclass cls, jint chat_id, jint archive)
+{
+	mrmailbox_archive_chat(get_mrmailbox_t(env, cls), chat_id, archive);
 }


@@ -417,6 +433,15 @@ JNIEXPORT jint Java_com_b44t_messenger_MrMailbox_setChatName(JNIEnv *env, jclass
 }


+JNIEXPORT jint Java_com_b44t_messenger_MrMailbox_setChatProfileImage(JNIEnv *env, jclass cls, jint chat_id, jstring image/*NULL=delete*/)
+{
+	CHAR_REF(image);
+		jint ret = (jint)mrmailbox_set_chat_profile_image(get_mrmailbox_t(env, cls), chat_id, imagePtr/*CHAR_REF() preserves NULL*/);
+	CHAR_UNREF(image);
+	return ret;
+}
+
+
 JNIEXPORT void Java_com_b44t_messenger_MrMailbox_deleteChat(JNIEnv *env, jclass cls, jint chat_id)
 {
 	mrmailbox_delete_chat(get_mrmailbox_t(env, cls), chat_id);
@@ -425,6 +450,13 @@ JNIEXPORT void Java_com_b44t_messenger_MrMailbox_deleteChat(JNIEnv *env, jclass

 /* MrMailbox - handle messages */

+
+JNIEXPORT jint Java_com_b44t_messenger_MrMailbox_getFreshMsgCount(JNIEnv *env, jclass cls, jint chat_id)
+{
+	return mrmailbox_get_fresh_msg_count(get_mrmailbox_t(env, cls), chat_id);
+}
+
+
 JNIEXPORT jlong Java_com_b44t_messenger_MrMailbox_MrMailboxGetMsg(JNIEnv *env, jclass c, jlong hMailbox, jint id)
 {
 	return (jlong)mrmailbox_get_msg((mrmailbox_t*)hMailbox, id);
@@ -458,13 +490,50 @@ JNIEXPORT void Java_com_b44t_messenger_MrMailbox_forwardMsgs(JNIEnv *env, jclass
 }


+JNIEXPORT jint Java_com_b44t_messenger_MrMailbox_sendTextMsg(JNIEnv *env, jclass cls, jint chat_id, jstring text)
+{
+	CHAR_REF(text);
+		jint msg_id = mrmailbox_send_text_msg(get_mrmailbox_t(env, cls), chat_id, textPtr);
+	CHAR_UNREF(text);
+	return msg_id;
+}
+
+
+JNIEXPORT jint Java_com_b44t_messenger_MrMailbox_sendVcardMsg(JNIEnv *env, jobject obj, jint chat_id, jint contact_id)
+{
+	return mrmailbox_send_vcard_msg(get_mrmailbox_t(env, obj), chat_id, contact_id);
+}
+
+
+JNIEXPORT jint Java_com_b44t_messenger_MrMailbox_sendMediaMsg(JNIEnv *env, jclass cls, 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 MR_MSG_IMAGE: msg_id = (jint)mrmailbox_send_image_msg(get_mrmailbox_t(env, cls), chat_id, filePtr, mimePtr, w, h); break;
+		case MR_MSG_VIDEO: msg_id = (jint)mrmailbox_send_video_msg(get_mrmailbox_t(env, cls), chat_id, filePtr, mimePtr, w, h, ms); break;
+		case MR_MSG_VOICE: msg_id = (jint)mrmailbox_send_voice_msg(get_mrmailbox_t(env, cls), chat_id, filePtr, mimePtr, ms); break;
+		case MR_MSG_AUDIO: msg_id = (jint)mrmailbox_send_audio_msg(get_mrmailbox_t(env, cls), chat_id, filePtr, mimePtr, ms, authorPtr, tracknamePtr); break;
+		default:           msg_id = (jint)mrmailbox_send_file_msg (get_mrmailbox_t(env, cls), chat_id, filePtr, mimePtr); break;
+	}
+	CHAR_UNREF(trackname);
+	CHAR_UNREF(author);
+	CHAR_UNREF(mime);
+	CHAR_UNREF(file);
+	return msg_id;
+}
+
+
 /* MrMailbox - handle config */

-JNIEXPORT void Java_com_b44t_messenger_MrMailbox_setConfig(JNIEnv *env, jclass cls, jstring key, jstring value)
+JNIEXPORT void Java_com_b44t_messenger_MrMailbox_setConfig(JNIEnv *env, jclass cls, jstring key, jstring value /*may be NULL*/)
 {
 	CHAR_REF(key);
 	CHAR_REF(value);
-		mrmailbox_set_config(get_mrmailbox_t(env, cls), keyPtr, valuePtr);
+		mrmailbox_set_config(get_mrmailbox_t(env, cls), keyPtr, valuePtr /*is NULL if value is NULL, CHAR_REF() handles this*/);
 	CHAR_UNREF(key);
 	CHAR_UNREF(value);
 }
@@ -478,16 +547,19 @@ JNIEXPORT void Java_com_b44t_messenger_MrMailbox_setConfigInt(JNIEnv *env, jclas
 }


-JNIEXPORT jstring Java_com_b44t_messenger_MrMailbox_getConfig(JNIEnv *env, jclass cls, jstring key, jstring def)
+JNIEXPORT jstring Java_com_b44t_messenger_MrMailbox_getConfig(JNIEnv *env, jclass cls, jstring key, jstring def/*may be NULL*/)
 {
 	CHAR_REF(key);
 	CHAR_REF(def);
-		char* temp = mrmailbox_get_config(get_mrmailbox_t(env, cls), keyPtr, defPtr);
-			jstring ret = JSTRING_NEW(temp);
+		char* temp = mrmailbox_get_config(get_mrmailbox_t(env, cls), keyPtr, defPtr /*is NULL if value is NULL, CHAR_REF() handles this*/);
+			jstring ret = NULL;
+			if( temp ) {
+				ret = JSTRING_NEW(temp);
+			}
 		free(temp);
 	CHAR_UNREF(key);
 	CHAR_UNREF(def);
-	return ret;
+	return ret; /* returns NULL only if key is unset and "def" is NULL */
 }


@@ -511,6 +583,15 @@ JNIEXPORT jstring Java_com_b44t_messenger_MrMailbox_getInfo(JNIEnv *env, jclass
 }


+JNIEXPORT jstring Java_com_b44t_messenger_MrMailbox_getContactEncrInfo(JNIEnv *env, jclass cls, jint contact_id)
+{
+	char* temp = mrmailbox_get_contact_encrinfo(get_mrmailbox_t(env, cls), contact_id);
+		jstring ret = JSTRING_NEW(temp);
+	free(temp);
+	return ret;
+}
+
+
 JNIEXPORT jstring Java_com_b44t_messenger_MrMailbox_cmdline(JNIEnv *env, jclass cls, jstring cmd)
 {
 	CHAR_REF(cmd);
@@ -522,6 +603,59 @@ JNIEXPORT jstring Java_com_b44t_messenger_MrMailbox_cmdline(JNIEnv *env, jclass
 }


+JNIEXPORT jstring Java_com_b44t_messenger_MrMailbox_initiateKeyTransfer(JNIEnv *env, jclass cls)
+{
+	jstring setup_code = NULL;
+	char* temp = mrmailbox_initiate_key_transfer(get_mrmailbox_t(env, cls));
+	if( temp ) {
+		setup_code = JSTRING_NEW(temp);
+		free(temp);
+	}
+	return setup_code;
+}
+
+
+JNIEXPORT jboolean Java_com_b44t_messenger_MrMailbox_continueKeyTransfer(JNIEnv *env, jclass cls, jint msg_id, jstring setupCode)
+{
+	CHAR_REF(setupCode);
+		jboolean ret = mrmailbox_continue_key_transfer(get_mrmailbox_t(env, cls), msg_id, setupCodePtr);
+	CHAR_UNREF(setupCode);
+	return ret;
+}
+
+
+JNIEXPORT int Java_com_b44t_messenger_MrMailbox_imex(JNIEnv *env, jclass cls, jint what, jstring dir)
+{
+	CHAR_REF(dir);
+		jint ret = mrmailbox_imex(get_mrmailbox_t(env, cls), what, dirPtr, "");
+	CHAR_UNREF(dir);
+	return ret;
+}
+
+
+JNIEXPORT jint Java_com_b44t_messenger_MrMailbox_checkPassword(JNIEnv *env, jclass cls, jstring pw)
+{
+	CHAR_REF(pw);
+		jint r = mrmailbox_check_password(get_mrmailbox_t(env, cls),  pwPtr);
+	CHAR_UNREF(pw);
+	return r;
+}
+
+
+JNIEXPORT jstring Java_com_b44t_messenger_MrMailbox_imexHasBackup(JNIEnv *env, jclass cls, jstring dir)
+{
+	CHAR_REF(dir);
+		jstring ret = NULL;
+		char* temp = mrmailbox_imex_has_backup(get_mrmailbox_t(env, cls),  dirPtr);
+		if( temp ) {
+			ret = JSTRING_NEW(temp);
+			free(temp);
+		}
+	CHAR_UNREF(dir);
+	return ret; /* may be NULL! */
+}
+
+
 JNIEXPORT void Java_com_b44t_messenger_MrMailbox_heartbeat(JNIEnv *env, jclass cls)
 {
    mrmailbox_heartbeat(get_mrmailbox_t(env, cls));
@@ -557,13 +691,21 @@ JNIEXPORT jint Java_com_b44t_messenger_MrChatlist_MrChatlistGetCnt(JNIEnv *env,

 JNIEXPORT jlong Java_com_b44t_messenger_MrChatlist_MrChatlistGetChatByIndex(JNIEnv *env, jclass c, jlong hChatlist, jint index)
 {
-	return (jlong)mrchatlist_get_chat_by_index((mrchatlist_t*)hChatlist, index);
+	mrchatlist_t* chatlist = (mrchatlist_t*)hChatlist;
+	return (jlong)mrmailbox_get_chat(chatlist->m_mailbox, mrchatlist_get_chat_id(chatlist, index));
+}
+
+
+JNIEXPORT jlong Java_com_b44t_messenger_MrChatlist_MrChatlistGetMsgByIndex(JNIEnv *env, jclass c, jlong hChatlist, jint index)
+{
+	mrchatlist_t* chatlist = (mrchatlist_t*)hChatlist;
+	return (jlong)mrmailbox_get_msg(chatlist->m_mailbox, mrchatlist_get_msg_id(chatlist, index));
 }


 JNIEXPORT jlong Java_com_b44t_messenger_MrChatlist_MrChatlistGetSummaryByIndex(JNIEnv *env, jclass c, jlong hChatlist, jint index, jlong hChat)
 {
-	return (jlong)mrchatlist_get_summary_by_index((mrchatlist_t*)hChatlist, index, (mrchat_t*)hChat);
+	return (jlong)mrchatlist_get_summary((mrchatlist_t*)hChatlist, index, (mrchat_t*)hChat);
 }


@@ -592,40 +734,61 @@ JNIEXPORT void Java_com_b44t_messenger_MrChat_MrChatUnref(JNIEnv *env, jclass c,
 }


-JNIEXPORT jint Java_com_b44t_messenger_MrChat_getId(JNIEnv *env, jclass cls)
+JNIEXPORT jint Java_com_b44t_messenger_MrChat_getId(JNIEnv *env, jobject obj)
 {
-	mrchat_t* ths = get_mrchat_t(env, cls); if( ths == NULL ) { return 0; }
+	mrchat_t* ths = get_mrchat_t(env, obj); if( ths == NULL ) { return 0; }
 	return ths->m_id;
 }


-JNIEXPORT jint Java_com_b44t_messenger_MrChat_getType(JNIEnv *env, jclass cls)
+JNIEXPORT jint Java_com_b44t_messenger_MrChat_getType(JNIEnv *env, jobject obj)
 {
-	mrchat_t* ths = get_mrchat_t(env, cls); if( ths == NULL ) { return 0; }
+	mrchat_t* ths = get_mrchat_t(env, obj); if( ths == NULL ) { return 0; }
 	return ths->m_type;
 }


-JNIEXPORT jstring Java_com_b44t_messenger_MrChat_getName(JNIEnv *env, jclass cls)
+JNIEXPORT jint Java_com_b44t_messenger_MrChat_getArchived(JNIEnv *env, jobject obj)
 {
-	mrchat_t* ths = get_mrchat_t(env, cls); if( ths == NULL ) { return JSTRING_NEW(NULL); }
+	mrchat_t* ths = get_mrchat_t(env, obj); if( ths == NULL ) { return 0; }
+	return ths->m_archived;
+}
+
+
+JNIEXPORT jstring Java_com_b44t_messenger_MrChat_getName(JNIEnv *env, jobject obj)
+{
+	mrchat_t* ths = get_mrchat_t(env, obj); if( ths == NULL ) { return JSTRING_NEW(NULL); }
 	return JSTRING_NEW(ths->m_name);
 }


-JNIEXPORT jstring Java_com_b44t_messenger_MrChat_getSubtitle(JNIEnv *env, jclass cls)
+JNIEXPORT jstring Java_com_b44t_messenger_MrChat_getSubtitle(JNIEnv *env, jobject obj)
 {
-	const char* temp = mrchat_get_subtitle(get_mrchat_t(env, cls));
+	const char* temp = mrchat_get_subtitle(get_mrchat_t(env, obj));
 		jstring ret = JSTRING_NEW(temp);
 	free(temp);
 	return ret;
 }


-JNIEXPORT jint Java_com_b44t_messenger_MrChat_getParamInt(JNIEnv *env, jclass cls, jint key, jint def)
+JNIEXPORT jstring Java_com_b44t_messenger_MrChat_getProfileImage(JNIEnv *env, jobject obj)
 {
-	mrchat_t* ths = get_mrchat_t(env, cls);
-	return mrparam_get_int(ths? ths->m_param:NULL, key, def);
+	const char* temp = mrchat_get_profile_image(get_mrchat_t(env, obj));
+		jstring ret = JSTRING_NEW(temp);
+	free(temp);
+	return ret;
+}
+
+
+JNIEXPORT jboolean Java_com_b44t_messenger_MrChat_isUnpromoted(JNIEnv *env, jobject obj)
+{
+	return mrchat_is_unpromoted(get_mrchat_t(env, obj)) != 0;
+}
+
+
+JNIEXPORT jboolean Java_com_b44t_messenger_MrChat_isSelfTalk(JNIEnv *env, jobject obj)
+{
+	return mrchat_is_self_talk(get_mrchat_t(env, obj)) != 0;
 }


@@ -653,18 +816,6 @@ JNIEXPORT jint Java_com_b44t_messenger_MrChat_MrChatGetDraftReplyToMsgId(JNIEnv
 }


-JNIEXPORT jint Java_com_b44t_messenger_MrChat_MrChatGetTotalMsgCount(JNIEnv *env, jclass c, jlong hChat)
-{
-	return mrchat_get_total_msg_count((mrchat_t*)hChat);
-}
-
-
-JNIEXPORT jint Java_com_b44t_messenger_MrChat_MrChatGetUnseenCount(JNIEnv *env, jclass c, jlong hChat)
-{
-	return mrchat_get_unseen_count((mrchat_t*)hChat);
-}
-
-
 JNIEXPORT jint Java_com_b44t_messenger_MrChat_MrChatSetDraft(JNIEnv *env, jclass c, jlong hChat, jstring draft /* NULL=delete */, jint replyToMsgId)
 {
 	CHAR_REF(draft);
@@ -674,54 +825,10 @@ JNIEXPORT jint Java_com_b44t_messenger_MrChat_MrChatSetDraft(JNIEnv *env, jclass
 }


-JNIEXPORT jint Java_com_b44t_messenger_MrChat_sendText(JNIEnv *env, jclass cls, jstring text)
-{
-	mrmsg_t* msg = mrmsg_new();
-		msg->m_type = MR_MSG_TEXT;
-		CHAR_REF(text);
-			msg->m_text = textPtr? strdup(textPtr) : NULL;
-		CHAR_UNREF(text);
-		jint msg_id = mrchat_send_msg(get_mrchat_t(env, cls), msg);
-	mrmsg_unref(msg);
-	return msg_id;
-}
-
-
-JNIEXPORT jint Java_com_b44t_messenger_MrChat_sendMedia(JNIEnv *env, jclass cls, jint type, jstring file, jstring mime, jint w, jint h, jint ms, jstring author, jstring trackname)
-{
-	mrmsg_t* msg = mrmsg_new();
-		msg->m_type = type;
-		CHAR_REF(mime);
-			mrparam_set(msg->m_param, 'm', mimePtr);
-		CHAR_UNREF(mime);
-		CHAR_REF(file);
-			mrparam_set(msg->m_param, 'f', filePtr);
-		CHAR_UNREF(file);		
-		if( type == MR_MSG_IMAGE || type == MR_MSG_GIF || type == MR_MSG_VIDEO ) {
-			mrparam_set_int(msg->m_param, 'w', w);
-			mrparam_set_int(msg->m_param, 'h', h);
-		}
-		if( type == MR_MSG_AUDIO || type == MR_MSG_VOICE || type == MR_MSG_VIDEO ) {
-			mrparam_set_int(msg->m_param, 'd', ms);
-		}
-		if( type == MR_MSG_AUDIO ) {
-			CHAR_REF(author);
-				mrparam_set(msg->m_param, 'N', authorPtr);
-			CHAR_UNREF(author);
-			CHAR_REF(trackname);
-				mrparam_set(msg->m_param, 'n', tracknamePtr);
-			CHAR_UNREF(trackname);
-		}
-		jint msg_id = mrchat_send_msg(get_mrchat_t(env, cls), msg);
-	mrmsg_unref(msg);
-	return msg_id;
-}
-
-
 JNIEXPORT jintArray Java_com_b44t_messenger_MrMailbox_getChatMedia(JNIEnv *env, jclass cls, jint chat_id, jint msg_type, jint or_msg_type)
 {
-	carray* ca = mrmailbox_get_chat_media(get_mrmailbox_t(env, cls), chat_id, msg_type, or_msg_type);
-	return carray2jintArray_n_carray_free(env, ca);
+	mrarray_t* ca = mrmailbox_get_chat_media(get_mrmailbox_t(env, cls), chat_id, msg_type, or_msg_type);
+	return mrarray2jintArray_n_mrarray_unref(env, ca);
 }


@@ -733,31 +840,31 @@ JNIEXPORT jint Java_com_b44t_messenger_MrMailbox_getNextMedia(JNIEnv *env, jclas

 JNIEXPORT jintArray Java_com_b44t_messenger_MrMailbox_getChatMsgs(JNIEnv *env, jclass cls, jint chat_id, jint flags, jint marker1before)
 {
-	carray* ca = mrmailbox_get_chat_msgs(get_mrmailbox_t(env, cls), chat_id, flags, marker1before);
-	return carray2jintArray_n_carray_free(env, ca);
+	mrarray_t* ca = mrmailbox_get_chat_msgs(get_mrmailbox_t(env, cls), chat_id, flags, marker1before);
+	return mrarray2jintArray_n_mrarray_unref(env, ca);
 }


 JNIEXPORT jintArray Java_com_b44t_messenger_MrMailbox_searchMsgs(JNIEnv *env, jclass cls, jint chat_id, jstring query)
 {
 	CHAR_REF(query);
-		carray* ca = mrmailbox_search_msgs(get_mrmailbox_t(env, cls), chat_id, queryPtr);
+		mrarray_t* ca = mrmailbox_search_msgs(get_mrmailbox_t(env, cls), chat_id, queryPtr);
 	CHAR_UNREF(query);
-	return carray2jintArray_n_carray_free(env, ca);
+	return mrarray2jintArray_n_mrarray_unref(env, ca);
 }


-JNIEXPORT jintArray Java_com_b44t_messenger_MrMailbox_getUnseenMsgs(JNIEnv *env, jclass cls)
+JNIEXPORT jintArray Java_com_b44t_messenger_MrMailbox_getFreshMsgs(JNIEnv *env, jclass cls)
 {
-	carray* ca = mrmailbox_get_unseen_msgs(get_mrmailbox_t(env, cls));
-	return carray2jintArray_n_carray_free(env, ca);
+	mrarray_t* ca = mrmailbox_get_fresh_msgs(get_mrmailbox_t(env, cls));
+	return mrarray2jintArray_n_mrarray_unref(env, ca);
 }


 JNIEXPORT jintArray Java_com_b44t_messenger_MrMailbox_getChatContacts(JNIEnv *env, jclass cls, jint chat_id)
 {
-	carray* ca = mrmailbox_get_chat_contacts(get_mrmailbox_t(env, cls), chat_id);
-	return carray2jintArray_n_carray_free(env, ca);
+	mrarray_t* ca = mrmailbox_get_chat_contacts(get_mrmailbox_t(env, cls), chat_id);
+	return mrarray2jintArray_n_mrarray_unref(env, ca);
 }


@@ -842,50 +949,35 @@ JNIEXPORT jint Java_com_b44t_messenger_MrMsg_MrMsgGetToId(JNIEnv *env, jclass c,
 }


-JNIEXPORT jstring Java_com_b44t_messenger_MrMsg_getParam(JNIEnv *env, jobject obj, jint key, jstring def)
+JNIEXPORT jint Java_com_b44t_messenger_MrMsg_getWidth(JNIEnv *env, jobject obj, jint def)
 {
-	mrmsg_t* ths = get_mrmsg_t(env, obj);
-	CHAR_REF(def);
-		char* temp = mrparam_get(ths? ths->m_param:NULL, key, defPtr);
-			jstring ret = JSTRING_NEW(temp);
-		free(temp);
-	CHAR_UNREF(def);
-	return ret;
+	jint ret = (jint)mrmsg_get_width(get_mrmsg_t(env, obj));
+	return ret? ret : def;
 }


-JNIEXPORT jint Java_com_b44t_messenger_MrMsg_getParamInt(JNIEnv *env, jobject obj, jint key, jint def)
+JNIEXPORT jint Java_com_b44t_messenger_MrMsg_getHeight(JNIEnv *env, jobject obj, jint def)
 {
-	mrmsg_t* ths = get_mrmsg_t(env, obj);
-	return mrparam_get_int(ths? ths->m_param:NULL, key, def);
+	jint ret = (jint)mrmsg_get_height(get_mrmsg_t(env, obj));
+	return ret? ret : def;
 }


-JNIEXPORT void Java_com_b44t_messenger_MrMsg_setParamInt(JNIEnv *env, jobject obj, jint key, jint value)
+JNIEXPORT jint Java_com_b44t_messenger_MrMsg_getDuration(JNIEnv *env, jobject obj)
 {
-	mrmsg_t* ths = get_mrmsg_t(env, obj);
-	mrparam_set_int(ths? ths->m_param:NULL, key, value);
+	return mrmsg_get_duration(get_mrmsg_t(env, obj));
 }


-JNIEXPORT void Java_com_b44t_messenger_MrMsg_saveParamToDisk(JNIEnv *env, jobject obj)
+JNIEXPORT void Java_com_b44t_messenger_MrMsg_lateFilingMediaSize(JNIEnv *env, jobject obj, jint width, jint height, jint duration)
 {
-	mrmsg_save_param_to_disk(get_mrmsg_t(env, obj));
+	mrmsg_latefiling_mediasize(get_mrmsg_t(env, obj), width, height, duration);
 }


 JNIEXPORT jint Java_com_b44t_messenger_MrMsg_getBytes(JNIEnv *env, jobject obj)
 {
-	jint ret = 0;
-	mrmsg_t* ths = get_mrmsg_t(env, obj);
-	if( ths ) {
-		const char* file = mrparam_get(ths->m_param, 'f', NULL);
-		if( file ) {
-			ret = mr_get_filebytes(file);
-			free(file);
-		}
-	}
-	return ret;
+	return (jint)mrmsg_get_filebytes(get_mrmsg_t(env, obj));
 }


@@ -895,15 +987,45 @@ JNIEXPORT jlong Java_com_b44t_messenger_MrMsg_getSummaryCPtr(JNIEnv *env, jobjec
 }


-JNIEXPORT jint Java_com_b44t_messenger_MrMsg_getSummarytext(JNIEnv *env, jobject obj, jint approx_characters)
+JNIEXPORT jstring Java_com_b44t_messenger_MrMsg_getSummarytext(JNIEnv *env, jobject obj, jint approx_characters)
 {
-	return JSTRING_NEW(mrmsg_get_summarytext(get_mrmsg_t(env, obj), approx_characters));
+	char* temp = mrmsg_get_summarytext(get_mrmsg_t(env, obj), approx_characters);
+		jstring ret = JSTRING_NEW(temp);
+	free(temp);
+	return ret;
 }


-JNIEXPORT jint Java_com_b44t_messenger_MrMsg_getFilename(JNIEnv *env, jobject obj)
+JNIEXPORT jint Java_com_b44t_messenger_MrMsg_showPadlock(JNIEnv *env, jobject obj)
 {
-	return JSTRING_NEW(mrmsg_get_filename(get_mrmsg_t(env, obj)));
+	return mrmsg_get_showpadlock(get_mrmsg_t(env, obj));
+}
+
+
+JNIEXPORT jstring Java_com_b44t_messenger_MrMsg_getFile(JNIEnv *env, jobject obj)
+{
+	char* temp = mrmsg_get_file(get_mrmsg_t(env, obj));
+		jstring ret =  JSTRING_NEW(temp);
+	free(temp);
+	return ret;
+}
+
+
+JNIEXPORT jstring Java_com_b44t_messenger_MrMsg_getFilemime(JNIEnv *env, jobject obj)
+{
+	char* temp = mrmsg_get_filemime(get_mrmsg_t(env, obj));
+		jstring ret =  JSTRING_NEW(temp);
+	free(temp);
+	return ret;
+}
+
+
+JNIEXPORT jstring Java_com_b44t_messenger_MrMsg_getFilename(JNIEnv *env, jobject obj)
+{
+	char* temp = mrmsg_get_filename(get_mrmsg_t(env, obj));
+		jstring ret =  JSTRING_NEW(temp);
+	free(temp);
+	return ret;
 }


@@ -913,12 +1035,40 @@ JNIEXPORT jlong Java_com_b44t_messenger_MrMsg_getMediainfoCPtr(JNIEnv *env, jobj
 }


-JNIEXPORT jint Java_com_b44t_messenger_MrMsg_isIncreation(JNIEnv *env, jobject obj)
+JNIEXPORT jboolean Java_com_b44t_messenger_MrMsg_isForwarded(JNIEnv *env, jobject obj)
 {
-    return (jint)mrmsg_is_increation(get_mrmsg_t(env, obj));
+    return mrmsg_is_forwarded(get_mrmsg_t(env, obj)) != 0;
 }


+JNIEXPORT jboolean Java_com_b44t_messenger_MrMsg_isIncreation(JNIEnv *env, jobject obj)
+{
+    return mrmsg_is_increation(get_mrmsg_t(env, obj)) != 0;
+}
+
+
+JNIEXPORT jboolean Java_com_b44t_messenger_MrMsg_isSystemcmd(JNIEnv *env, jobject obj)
+{
+    return mrmsg_is_systemcmd(get_mrmsg_t(env, obj)) != 0;
+}
+
+
+JNIEXPORT jboolean Java_com_b44t_messenger_MrMsg_isSetupMessage(JNIEnv *env, jobject obj)
+{
+    return mrmsg_is_setupmessage(get_mrmsg_t(env, obj));
+}
+
+
+JNIEXPORT jstring Java_com_b44t_messenger_MrMsg_getSetupCodeBegin(JNIEnv *env, jobject obj)
+{
+	char* temp = mrmsg_get_setupcodebegin(get_mrmsg_t(env, obj));
+		jstring ret =  JSTRING_NEW(temp);
+	free(temp);
+	return ret;
+}
+
+
+
 /*******************************************************************************
 * MrContact
 ******************************************************************************/
@@ -944,76 +1094,105 @@ JNIEXPORT void Java_com_b44t_messenger_MrContact_MrContactUnref(JNIEnv *env, jcl
 }


-JNIEXPORT jstring Java_com_b44t_messenger_MrContact_MrContactGetName(JNIEnv *env, jclass c, jlong hContact)
+JNIEXPORT jstring Java_com_b44t_messenger_MrContact_getName(JNIEnv *env, jobject obj)
 {
-	mrcontact_t* ths = (mrcontact_t*)hContact; if( ths == NULL ) { return JSTRING_NEW(NULL); }
-	return JSTRING_NEW(ths->m_name);
+	const char* temp = mrcontact_get_name(get_mrcontact_t(env, obj));
+		jstring ret = JSTRING_NEW(temp);
+	free(temp);
+	return ret;
 }


-JNIEXPORT jstring Java_com_b44t_messenger_MrContact_getAuthName(JNIEnv *env, jclass cls)
+JNIEXPORT jstring Java_com_b44t_messenger_MrContact_getDisplayName(JNIEnv *env, jobject obj)
 {
-	mrcontact_t* ths = get_mrcontact_t(env, cls); if( ths == NULL ) { return JSTRING_NEW(NULL); }
-	return JSTRING_NEW(ths->m_authname);
+	const char* temp = mrcontact_get_display_name(get_mrcontact_t(env, obj));
+		jstring ret = JSTRING_NEW(temp);
+	free(temp);
+	return ret;
 }


-JNIEXPORT jstring Java_com_b44t_messenger_MrContact_MrContactGetAddr(JNIEnv *env, jclass c, jlong hContact)
+JNIEXPORT jstring Java_com_b44t_messenger_MrContact_getAddr(JNIEnv *env, jobject obj)
 {
-	mrcontact_t* ths = (mrcontact_t*)hContact; if( ths == NULL ) { return JSTRING_NEW(NULL); }
-	return JSTRING_NEW(ths->m_addr);
+	const char* temp = mrcontact_get_addr(get_mrcontact_t(env, obj));
+		jstring ret = JSTRING_NEW(temp);
+	free(temp);
+	return ret;
 }


-JNIEXPORT jint Java_com_b44t_messenger_MrContact_MrContactIsBlocked(JNIEnv *env, jclass c, jlong hContact)
+JNIEXPORT jstring Java_com_b44t_messenger_MrContact_getNameNAddr(JNIEnv *env, jobject obj)
 {
-	mrcontact_t* ths = (mrcontact_t*)hContact; if( ths == NULL ) { return 0; }
-	return (jint)ths->m_blocked;
+	const char* temp = mrcontact_get_name_n_addr(get_mrcontact_t(env, obj));
+		jstring ret = JSTRING_NEW(temp);
+	free(temp);
+	return ret;
+}
+
+
+JNIEXPORT jboolean Java_com_b44t_messenger_MrContact_isBlocked(JNIEnv *env, jobject obj)
+{
+	mrcontact_t* ths = get_mrcontact_t(env, obj); if( ths == NULL ) { return 0; }
+	return (jboolean)(ths->m_blocked != 0);
 }


 /*******************************************************************************
- * MrPoortext
+ * MrLot
 ******************************************************************************/


-JNIEXPORT void Java_com_b44t_messenger_MrPoortext_MrPoortextUnref(JNIEnv *env, jclass c, jlong hPoortext)
+static mrlot_t* get_mrlot_t(JNIEnv *env, jobject obj)
 {
-	mrpoortext_unref((mrpoortext_t*)hPoortext);
+	static jfieldID fid = 0;
+	if( fid == 0 ) {
+		jclass cls = (*env)->GetObjectClass(env, obj);
+		fid = (*env)->GetFieldID(env, cls, "m_hLot", "J" /*Signature, J=long*/);
+	}
+	if( fid ) {
+		return (mrlot_t*)(*env)->GetLongField(env, obj, fid);
+	}
+	return NULL;
 }


-JNIEXPORT jstring Java_com_b44t_messenger_MrPoortext_MrPoortextGetText1(JNIEnv *env, jclass c, jlong hPoortext)
+JNIEXPORT void Java_com_b44t_messenger_MrLot_unref(JNIEnv *env, jclass cls, jlong hLot)
 {
-	mrpoortext_t* ths = (mrpoortext_t*)hPoortext; if( ths == NULL ) { return JSTRING_NEW(NULL); }
+	mrlot_unref((mrlot_t*)hLot);
+}
+
+
+JNIEXPORT jstring Java_com_b44t_messenger_MrLot_getText1(JNIEnv *env, jobject obj)
+{
+	mrlot_t* ths = get_mrlot_t(env, obj); if( ths == NULL ) { return JSTRING_NEW(NULL); }
 	return JSTRING_NEW(ths->m_text1);
 }


-JNIEXPORT jint Java_com_b44t_messenger_MrPoortext_MrPoortextGetText1Meaning(JNIEnv *env, jclass c, jlong hPoortext)
+JNIEXPORT jint Java_com_b44t_messenger_MrLot_getText1Meaning(JNIEnv *env, jobject obj)
 {
-	mrpoortext_t* ths = (mrpoortext_t*)hPoortext; if( ths == NULL ) { return 0; }
+	mrlot_t* ths = get_mrlot_t(env, obj); if( ths == NULL ) { return 0; }
 	return ths->m_text1_meaning;
 }


-JNIEXPORT jstring Java_com_b44t_messenger_MrPoortext_MrPoortextGetText2(JNIEnv *env, jclass c, jlong hPoortext)
+JNIEXPORT jstring Java_com_b44t_messenger_MrLot_getText2(JNIEnv *env, jobject obj)
 {
-	mrpoortext_t* ths = (mrpoortext_t*)hPoortext; if( ths == NULL ) { return JSTRING_NEW(NULL); }
+	mrlot_t* ths = get_mrlot_t(env, obj); if( ths == NULL ) { return JSTRING_NEW(NULL); }
 	return JSTRING_NEW(ths->m_text2);
 }


-JNIEXPORT jlong Java_com_b44t_messenger_MrPoortext_MrPoortextGetTimestamp(JNIEnv *env, jclass c, jlong hPoortext)
+JNIEXPORT jlong Java_com_b44t_messenger_MrLot_getTimestamp(JNIEnv *env, jobject obj)
 {
-	mrpoortext_t* ths = (mrpoortext_t*)hPoortext; if( ths == NULL ) { return 0; }
+	mrlot_t* ths = get_mrlot_t(env, obj); if( ths == NULL ) { return 0; }
 	return ths->m_timestamp;
 }


-JNIEXPORT jint Java_com_b44t_messenger_MrPoortext_MrPoortextGetState(JNIEnv *env, jclass c, jlong hPoortext)
+JNIEXPORT jint Java_com_b44t_messenger_MrLot_getState(JNIEnv *env, jobject obj)
 {
-	mrpoortext_t* ths = (mrpoortext_t*)hPoortext; if( ths == NULL ) { return 0; }
+	mrlot_t* ths = get_mrlot_t(env, obj); if( ths == NULL ) { return 0; }
 	return ths->m_state;
 }

@@ -8,7 +8,7 @@
 LOCAL_CFLAGS += -DOPENSSL_THREADS -D_REENTRANT -DDSO_DLFCN -DHAVE_DLFCN_H -DL_ENDIAN #-DTERMIO

 # From DEPFLAG=
-LOCAL_CFLAGS += -DOPENSSL_NO_CAMELLIA -DOPENSSL_NO_CAPIENG -DOPENSSL_NO_CAST -DOPENSSL_NO_CMS -DOPENSSL_NO_GMP -DOPENSSL_NO_IDEA -DOPENSSL_NO_JPAKE -DOPENSSL_NO_MD2 -DOPENSSL_NO_MDC2 -DOPENSSL_NO_RC5 -DOPENSSL_NO_SHA0 -DOPENSSL_NO_RFC3779 -DOPENSSL_NO_SEED -DOPENSSL_NO_STORE -DOPENSSL_NO_WHIRLPOOL
+LOCAL_CFLAGS += -DOPENSSL_NO_CAPIENG -DOPENSSL_NO_CMS -DOPENSSL_NO_GMP -DOPENSSL_NO_IDEA -DOPENSSL_NO_JPAKE -DOPENSSL_NO_MD2 -DOPENSSL_NO_MDC2 -DOPENSSL_NO_RC5 -DOPENSSL_NO_SHA0 -DOPENSSL_NO_RFC3779 -DOPENSSL_NO_SEED -DOPENSSL_NO_STORE -DOPENSSL_NO_WHIRLPOOL

 # Extra
 LOCAL_CFLAGS += -DOPENSSL_NO_HW -DOPENSSL_NO_ENGINE -DZLIB
@@ -1,6 +1,6 @@
 /*******************************************************************************
 *
- *                          Messenger Android Frontend
+ *                              Delta Chat Android
 *                        (C) 2013-2016 Nikolai Kudashov
 *                           (C) 2017 Björn Petersen
 *                    Contact: r10s@b44t.com, http://b44t.com
@@ -53,7 +53,7 @@
        android:supportsRtl="true">

        <activity
-            android:name="com.b44t.ui.LaunchActivity"
+            android:name=".LaunchActivity"
            android:configChanges="keyboard|keyboardHidden|orientation|screenSize"
            android:launchMode="singleTask"
            android:windowSoftInputMode="adjustPan">
@@ -105,17 +105,17 @@
                <category android:name="android.intent.category.BROWSABLE"/>
            </intent-filter>
        </activity>
-        <!-- if used, add 'android:manageSpaceActivity="com.b44t.ui.ManageSpaceActivity"' to application-tag
+
        <activity
-            android:name="com.b44t.ui.ManageSpaceActivity"
-            android:configChanges="keyboard|keyboardHidden|orientation|screenSize"
-            android:launchMode="singleTask"
-            android:windowSoftInputMode="adjustPan">
-        </activity> -->
-        <activity
-            android:name="com.b44t.ui.IntroActivity"
+            android:name=".WelcomeActivity"
            android:configChanges="keyboard|keyboardHidden|orientation|screenSize">
        </activity>
+
+        <activity
+            android:name=".SettingsAdvActivity"
+            android:configChanges="keyboard|keyboardHidden|orientation|screenSize">
+        </activity>
+
        <activity
            android:name="com.b44t.messenger.OpenChatReceiver"
            android:configChanges="keyboard|keyboardHidden|orientation|screenSize"
@@ -1,6 +1,6 @@
 /*******************************************************************************
 *
- *                          Messenger Android Frontend
+ *                              Delta Chat Android
 *                        (C) 2013-2016 Nikolai Kudashov
 *                           (C) 2017 Björn Petersen
 *                    Contact: r10s@b44t.com, http://b44t.com
@@ -21,14 +21,13 @@
 ******************************************************************************/


-package com.b44t.ui.ActionBar;
+package com.b44t.messenger.ActionBar;

 import android.animation.Animator;
 import android.animation.AnimatorSet;
 import android.animation.ObjectAnimator;
 import android.content.Context;
 import android.content.res.Configuration;
-import android.graphics.Typeface;
 import android.graphics.drawable.Drawable;
 import android.os.Build;
 import android.view.Gravity;
@@ -40,7 +39,7 @@ import android.widget.ImageView;
 import com.b44t.messenger.AndroidUtilities;
 import com.b44t.messenger.AnimatorListenerAdapterProxy;
 import com.b44t.messenger.ApplicationLoader;
-import com.b44t.ui.Components.LayoutHelper;
+import com.b44t.messenger.Components.LayoutHelper;

 import java.util.ArrayList;

@@ -56,6 +55,10 @@ public class ActionBar extends FrameLayout {
        }
    }

+    public static final int TITLE_WITHOUT_BACK_X  = 16; /*original value: 18*/
+    public static final int TITLE_AFTER_BACK_X    = 58; /*original value: 72*/
+    public static final int AVATAR_AFTER_BACK_X   = 48; /*original value: 56, you have also to adapt the animation, if you change this value (see ProfileActivity.ANIM_OFF) */
+
    private ImageView backButtonImageView;
    private SimpleTextView titleTextView;
    private SimpleTextView subtitleTextView;
@@ -374,10 +377,6 @@ public class ActionBar extends FrameLayout {
        if (subtitleTextView != null) {
            subtitleTextView.setVisibility(visible ? INVISIBLE : VISIBLE);
        }
-        Drawable drawable = backButtonImageView.getDrawable();
-        if (drawable != null && drawable instanceof MenuDrawable) {
-            ((MenuDrawable) drawable).setRotation(visible ? 1 : 0, true);
-        }
    }

    public void setInterceptTouches(boolean value) {
@@ -410,15 +409,15 @@ public class ActionBar extends FrameLayout {
        int textLeft;
        if (backButtonImageView != null && backButtonImageView.getVisibility() != GONE) {
            backButtonImageView.measure(MeasureSpec.makeMeasureSpec(AndroidUtilities.dp(54), MeasureSpec.EXACTLY), actionBarHeightSpec);
-            textLeft = AndroidUtilities.dp(AndroidUtilities.isTablet() ? 80 : 72);
+            textLeft = AndroidUtilities.dp(TITLE_AFTER_BACK_X);
        } else {
-            textLeft = AndroidUtilities.dp(AndroidUtilities.isTablet() ? 26 : 18);
+            textLeft = AndroidUtilities.dp(TITLE_WITHOUT_BACK_X);
        }

        if (menu != null && menu.getVisibility() != GONE) {
            int menuWidth;
            if (isSearchFieldVisible) {
-                menuWidth = MeasureSpec.makeMeasureSpec(width - AndroidUtilities.dp(AndroidUtilities.isTablet() ? 74 : 66), MeasureSpec.EXACTLY);
+                menuWidth = MeasureSpec.makeMeasureSpec(width - AndroidUtilities.dp(TITLE_AFTER_BACK_X), MeasureSpec.EXACTLY);
            } else {
                menuWidth = MeasureSpec.makeMeasureSpec(width, MeasureSpec.AT_MOST);
            }
@@ -429,12 +428,11 @@ public class ActionBar extends FrameLayout {
            int availableWidth = width - (menu != null ? menu.getMeasuredWidth() : 0) - AndroidUtilities.dp(16) - textLeft;

            if (titleTextView != null && titleTextView.getVisibility() != GONE) {
-                titleTextView.setTextSize(!AndroidUtilities.isTablet() && getResources().getConfiguration().orientation == Configuration.ORIENTATION_LANDSCAPE ? 18 : 20);
+                titleTextView.setTextSize(getResources().getConfiguration().orientation == Configuration.ORIENTATION_LANDSCAPE ? 18 : 20);
                titleTextView.measure(MeasureSpec.makeMeasureSpec(availableWidth, MeasureSpec.AT_MOST), MeasureSpec.makeMeasureSpec(AndroidUtilities.dp(24), MeasureSpec.AT_MOST));

            }
            if (subtitleTextView != null && subtitleTextView.getVisibility() != GONE) {
-                //subtitleTextView.setTextSize(!AndroidUtilities.isTablet() && getResources().getConfiguration().orientation == Configuration.ORIENTATION_LANDSCAPE ? 14 : 16);
                subtitleTextView.measure(MeasureSpec.makeMeasureSpec(availableWidth, MeasureSpec.AT_MOST), MeasureSpec.makeMeasureSpec(AndroidUtilities.dp(20), MeasureSpec.AT_MOST));
            }
        }
@@ -456,27 +454,27 @@ public class ActionBar extends FrameLayout {
        int textLeft;
        if (backButtonImageView != null && backButtonImageView.getVisibility() != GONE) {
            backButtonImageView.layout(0, additionalTop, backButtonImageView.getMeasuredWidth(), additionalTop + backButtonImageView.getMeasuredHeight());
-            textLeft = AndroidUtilities.dp(AndroidUtilities.isTablet() ? 80 : 72);
+            textLeft = AndroidUtilities.dp(TITLE_AFTER_BACK_X);
        } else {
-            textLeft = AndroidUtilities.dp(AndroidUtilities.isTablet() ? 26 : 18);
+            textLeft = AndroidUtilities.dp(TITLE_WITHOUT_BACK_X);
        }

        if (menu != null && menu.getVisibility() != GONE) {
-            int menuLeft = isSearchFieldVisible ? AndroidUtilities.dp(AndroidUtilities.isTablet() ? 74 : 66) : (right - left) - menu.getMeasuredWidth();
+            int menuLeft = isSearchFieldVisible ? AndroidUtilities.dp(TITLE_AFTER_BACK_X) : (right - left) - menu.getMeasuredWidth();
            menu.layout(menuLeft, additionalTop, menuLeft + menu.getMeasuredWidth(), additionalTop + menu.getMeasuredHeight());
        }

        if (titleTextView != null && titleTextView.getVisibility() != GONE) {
            int textTop;
            if (subtitleTextView != null && subtitleTextView.getVisibility() != GONE) {
-                textTop = (getCurrentActionBarHeight() / 2 - titleTextView.getTextHeight()) / 2 + AndroidUtilities.dp(!AndroidUtilities.isTablet() && getResources().getConfiguration().orientation == Configuration.ORIENTATION_LANDSCAPE ? 2 : 3);
+                textTop = (getCurrentActionBarHeight() / 2 - titleTextView.getTextHeight()) / 2 + AndroidUtilities.dp(getResources().getConfiguration().orientation == Configuration.ORIENTATION_LANDSCAPE ? 2 : 3);
            } else {
                textTop = (getCurrentActionBarHeight() - titleTextView.getTextHeight()) / 2;
            }
            titleTextView.layout(textLeft, additionalTop + textTop, textLeft + titleTextView.getMeasuredWidth(), additionalTop + textTop + titleTextView.getTextHeight());
        }
        if (subtitleTextView != null && subtitleTextView.getVisibility() != GONE) {
-            int textTop = getCurrentActionBarHeight() / 2 + (getCurrentActionBarHeight() / 2 - subtitleTextView.getTextHeight()) / 2 - AndroidUtilities.dp(!AndroidUtilities.isTablet() && getResources().getConfiguration().orientation == Configuration.ORIENTATION_LANDSCAPE ? 1 : 1);
+            int textTop = getCurrentActionBarHeight() / 2 + (getCurrentActionBarHeight() / 2 - subtitleTextView.getTextHeight()) / 2 - AndroidUtilities.dp(getResources().getConfiguration().orientation == Configuration.ORIENTATION_LANDSCAPE ? 1 : 1);
            subtitleTextView.layout(textLeft, additionalTop + textTop, textLeft + subtitleTextView.getMeasuredWidth(), additionalTop + textTop + subtitleTextView.getTextHeight());
        }

@@ -547,22 +545,6 @@ public class ActionBar extends FrameLayout {
        allowOverlayTitle = value;
    }

-    public void setTitleOverlayText(String text) {
-        /* EDIT BY MR
-        if (!allowOverlayTitle || parentFragment.parentLayout == null) {
-            return;
-        }
-        CharSequence textToSet = text != null ? text : lastTitle;
-        if (textToSet != null && titleTextView == null) {
-            createTitleTextView();
-        }
-        if (titleTextView != null) {
-            titleTextView.setVisibility(textToSet != null && !isSearchFieldVisible ? VISIBLE : INVISIBLE);
-            titleTextView.setText(textToSet);
-        }
-        */
-    }
-
    public boolean isSearchFieldVisible() {
        return isSearchFieldVisible;
    }
@@ -599,9 +581,7 @@ public class ActionBar extends FrameLayout {
    }

    public static int getCurrentActionBarHeight() {
-        if (AndroidUtilities.isTablet()) {
-            return AndroidUtilities.dp(64);
-        } else if (ApplicationLoader.applicationContext.getResources().getConfiguration().orientation == Configuration.ORIENTATION_LANDSCAPE) {
+        if (ApplicationLoader.applicationContext.getResources().getConfiguration().orientation == Configuration.ORIENTATION_LANDSCAPE) {
            return AndroidUtilities.dp(48);
        } else {
            return AndroidUtilities.dp(56);
@@ -1,6 +1,6 @@
 /*******************************************************************************
 *
- *                          Messenger Android Frontend
+ *                              Delta Chat Android
 *                        (C) 2013-2016 Nikolai Kudashov
 *                           (C) 2017 Björn Petersen
 *                    Contact: r10s@b44t.com, http://b44t.com
@@ -21,7 +21,7 @@
 ******************************************************************************/


-package com.b44t.ui.ActionBar;
+package com.b44t.messenger.ActionBar;

 import android.animation.Animator;
 import android.animation.AnimatorSet;
@@ -49,7 +49,7 @@ import android.widget.LinearLayout;
 import com.b44t.messenger.AndroidUtilities;
 import com.b44t.messenger.R;
 import com.b44t.messenger.AnimatorListenerAdapterProxy;
-import com.b44t.ui.Components.LayoutHelper;
+import com.b44t.messenger.Components.LayoutHelper;

 import java.util.ArrayList;

@@ -60,7 +60,6 @@ public class ActionBarLayout extends FrameLayout {
        boolean needPresentFragment(BaseFragment fragment, boolean removeLast, boolean forceWithoutAnimation, ActionBarLayout layout);
        boolean needAddFragmentToStack(BaseFragment fragment, ActionBarLayout layout);
        boolean needCloseLastFragment(ActionBarLayout layout);
-        void onRebuildAllFragments(ActionBarLayout layout);
    }

    public class LinearLayoutContainer extends LinearLayout {
@@ -131,7 +130,6 @@ public class ActionBarLayout extends FrameLayout {

    private LinearLayoutContainer containerView;
    private LinearLayoutContainer containerViewBack;
-    private DrawerLayoutContainer drawerLayoutContainer;
    private ActionBar currentActionBar;

    private AnimatorSet currentAnimation;
@@ -153,16 +151,12 @@ public class ActionBarLayout extends FrameLayout {
    private int startedTrackingPointerId;
    private Runnable onCloseAnimationEndRunnable;
    private Runnable onOpenAnimationEndRunnable;
-    private boolean useAlphaAnimations;
-    private View backgroundView;
    private boolean removeActionBarExtraHeight;
    private Runnable animationRunnable;

    private float animationProgress = 0.0f;
    private long lastFrameTime;

-    private String titleOverlayText;
-
    private ActionBarLayoutDelegate delegate = null;
    protected Activity parentActivity = null;

@@ -385,7 +379,6 @@ public class ActionBarLayout extends FrameLayout {
                lastFragment.actionBar.setOccupyStatusBar(false);
            }
            containerViewBack.addView(lastFragment.actionBar);
-            lastFragment.actionBar.setTitleOverlayText(titleOverlayText);
        }
        containerViewBack.addView(fragmentView);
        ViewGroup.LayoutParams layoutParams = fragmentView.getLayoutParams();
@@ -678,7 +671,6 @@ public class ActionBarLayout extends FrameLayout {
                parent.removeView(fragment.actionBar);
            }
            containerViewBack.addView(fragment.actionBar);
-            fragment.actionBar.setTitleOverlayText(titleOverlayText);
        }

        containerViewBack.addView(fragmentView);
@@ -702,110 +694,56 @@ public class ActionBarLayout extends FrameLayout {
        bringChildToFront(containerView);
        if (!needAnimation) {
            presentFragmentInternalRemoveOld(removeLast, currentFragment);
-            if (backgroundView != null) {
-                backgroundView.setVisibility(VISIBLE);
-            }
        }

        if (needAnimation) {
-            if (useAlphaAnimations && fragmentsStack.size() == 1) {
-                presentFragmentInternalRemoveOld(removeLast, currentFragment);
-
-                transitionAnimationStartTime = System.currentTimeMillis();
-                transitionAnimationInProgress = true;
-                onOpenAnimationEndRunnable = new Runnable() {
-                    @Override
-                    public void run() {
-                        fragment.onTransitionAnimationEnd(true, false);
-                        fragment.onBecomeFullyVisible();
-                    }
-                };
-                ArrayList<Animator> animators = new ArrayList<>();
-                animators.add(ObjectAnimator.ofFloat(this, "alpha", 0.0f, 1.0f));
-                if (backgroundView != null) {
-                    backgroundView.setVisibility(VISIBLE);
-                    animators.add(ObjectAnimator.ofFloat(backgroundView, "alpha", 0.0f, 1.0f));
-                }
-
-                fragment.onTransitionAnimationStart(true, false);
-                currentAnimation = new AnimatorSet();
-                currentAnimation.playTogether(animators);
-                currentAnimation.setInterpolator(accelerateDecelerateInterpolator);
-                currentAnimation.setDuration(200);
-                currentAnimation.addListener(new AnimatorListenerAdapterProxy() {
-                    @Override
-                    public void onAnimationEnd(Animator animation) {
-                        onAnimationEndCheck(false);
-                    }
-                });
-                currentAnimation.start();
-            } else {
-                transitionAnimationStartTime = System.currentTimeMillis();
-                transitionAnimationInProgress = true;
-                onOpenAnimationEndRunnable = new Runnable() {
-                    @Override
-                    public void run() {
-                        if (Build.VERSION.SDK_INT > 15) {
-                            containerView.setLayerType(LAYER_TYPE_NONE, null);
-                            containerViewBack.setLayerType(LAYER_TYPE_NONE, null);
-                        }
-                        presentFragmentInternalRemoveOld(removeLast, currentFragment);
-                        fragment.onTransitionAnimationEnd(true, false);
-                        fragment.onBecomeFullyVisible();
-                        containerView.setTranslationX(0);
-                    }
-                };
-                fragment.onTransitionAnimationStart(true, false);
-                AnimatorSet animation = fragment.onCustomTransitionAnimation(true, new Runnable() {
-                    @Override
-                    public void run() {
-                        onAnimationEndCheck(false);
-                    }
-                });
-                if (animation == null) {
-                    containerView.setAlpha(0.0f);
-                    containerView.setTranslationX(48.0f);
-                    if (containerView.isKeyboardVisible || containerViewBack.isKeyboardVisible) {
-                        waitingForKeyboardCloseRunnable = new Runnable() {
-                            @Override
-                            public void run() {
-                                if (waitingForKeyboardCloseRunnable != this) {
-                                    return;
-                                }
-                                startLayoutAnimation(true, true);
-                            }
-                        };
-                        AndroidUtilities.runOnUIThread(waitingForKeyboardCloseRunnable, 200);
-                    } else if (fragment.needDelayOpenAnimation()) {
-                        delayedOpenAnimationRunnable = new Runnable() {
-                            @Override
-                            public void run() {
-                                if (delayedOpenAnimationRunnable != this) {
-                                    return;
-                                }
-                                delayedOpenAnimationRunnable = null;
-                                startLayoutAnimation(true, true);
-                            }
-                        };
-                        AndroidUtilities.runOnUIThread(delayedOpenAnimationRunnable, 200);
-                    } else {
-                        startLayoutAnimation(true, true);
-                    }
-                } else {
+            transitionAnimationStartTime = System.currentTimeMillis();
+            transitionAnimationInProgress = true;
+            onOpenAnimationEndRunnable = new Runnable() {
+                @Override
+                public void run() {
                    if (Build.VERSION.SDK_INT > 15) {
-                        //containerView.setLayerType(LAYER_TYPE_HARDWARE, null);
-                        //containerViewBack.setLayerType(LAYER_TYPE_HARDWARE, null);
+                        containerView.setLayerType(LAYER_TYPE_NONE, null);
+                        containerViewBack.setLayerType(LAYER_TYPE_NONE, null);
                    }
-                    containerView.setAlpha(1.0f);
-                    containerView.setTranslationX(0.0f);
-                    currentAnimation = animation;
+                    presentFragmentInternalRemoveOld(removeLast, currentFragment);
+                    fragment.onTransitionAnimationEnd(true, false);
+                    fragment.onBecomeFullyVisible();
+                    containerView.setTranslationX(0);
+                }
+            };
+            fragment.onTransitionAnimationStart(true, false);
+            {
+                containerView.setAlpha(0.0f);
+                containerView.setTranslationX(48.0f);
+                if (containerView.isKeyboardVisible || containerViewBack.isKeyboardVisible) {
+                    waitingForKeyboardCloseRunnable = new Runnable() {
+                        @Override
+                        public void run() {
+                            if (waitingForKeyboardCloseRunnable != this) {
+                                return;
+                            }
+                            startLayoutAnimation(true, true);
+                        }
+                    };
+                    AndroidUtilities.runOnUIThread(waitingForKeyboardCloseRunnable, 200);
+                } else if (fragment.needDelayOpenAnimation()) {
+                    delayedOpenAnimationRunnable = new Runnable() {
+                        @Override
+                        public void run() {
+                            if (delayedOpenAnimationRunnable != this) {
+                                return;
+                            }
+                            delayedOpenAnimationRunnable = null;
+                            startLayoutAnimation(true, true);
+                        }
+                    };
+                    AndroidUtilities.runOnUIThread(delayedOpenAnimationRunnable, 200);
+                } else {
+                    startLayoutAnimation(true, true);
                }
            }
        } else {
-            if (backgroundView != null) {
-                backgroundView.setAlpha(1.0f);
-                backgroundView.setVisibility(VISIBLE);
-            }
            fragment.onTransitionAnimationStart(true, false);
            fragment.onTransitionAnimationEnd(true, false);
            fragment.onBecomeFullyVisible();
@@ -895,7 +833,6 @@ public class ActionBarLayout extends FrameLayout {
                    parent.removeView(previousFragment.actionBar);
                }
                containerView.addView(previousFragment.actionBar);
-                previousFragment.actionBar.setTitleOverlayText(titleOverlayText);
            }
            containerView.addView(fragmentView);
            ViewGroup.LayoutParams layoutParams = fragmentView.getLayoutParams();
@@ -932,13 +869,8 @@ public class ActionBarLayout extends FrameLayout {
                        previousFragmentFinal.onBecomeFullyVisible();
                    }
                };
-                AnimatorSet animation = currentFragment.onCustomTransitionAnimation(false, new Runnable() {
-                    @Override
-                    public void run() {
-                        onAnimationEndCheck(false);
-                    }
-                });
-                if (animation == null) {
+
+                {
                    if (containerView.isKeyboardVisible || containerViewBack.isKeyboardVisible) {
                        waitingForKeyboardCloseRunnable = new Runnable() {
                            @Override
@@ -953,12 +885,6 @@ public class ActionBarLayout extends FrameLayout {
                    } else {
                        startLayoutAnimation(false, true);
                    }
-                } else {
-                    if (Build.VERSION.SDK_INT > 15) {
-                        //containerView.setLayerType(LAYER_TYPE_HARDWARE, null);
-                        //containerViewBack.setLayerType(LAYER_TYPE_HARDWARE, null);
-                    }
-                    currentAnimation = animation;
                }
            } else {
                currentFragment.onTransitionAnimationEnd(false, false);
@@ -966,53 +892,8 @@ public class ActionBarLayout extends FrameLayout {
                previousFragment.onBecomeFullyVisible();
            }
        } else {
-            if (useAlphaAnimations) {
-                transitionAnimationStartTime = System.currentTimeMillis();
-                transitionAnimationInProgress = true;
-
-                onCloseAnimationEndRunnable = new Runnable() {
-                    @Override
-                    public void run() {
-                        removeFragmentFromStackInternal(currentFragment);
-                        setVisibility(GONE);
-                        if (backgroundView != null) {
-                            backgroundView.setVisibility(GONE);
-                        }
-                        if (drawerLayoutContainer != null) {
-                            drawerLayoutContainer.setAllowOpenDrawer(true, false);
-                        }
-                    }
-                };
-
-                ArrayList<Animator> animators = new ArrayList<>();
-                animators.add(ObjectAnimator.ofFloat(this, "alpha", 1.0f, 0.0f));
-                if (backgroundView != null) {
-                    animators.add(ObjectAnimator.ofFloat(backgroundView, "alpha", 1.0f, 0.0f));
-                }
-
-                currentAnimation = new AnimatorSet();
-                currentAnimation.playTogether(animators);
-                currentAnimation.setInterpolator(accelerateDecelerateInterpolator);
-                currentAnimation.setDuration(200);
-                currentAnimation.addListener(new AnimatorListenerAdapterProxy() {
-                    @Override
-                    public void onAnimationStart(Animator animation) {
-                        transitionAnimationStartTime = System.currentTimeMillis();
-                    }
-
-                    @Override
-                    public void onAnimationEnd(Animator animation) {
-                        onAnimationEndCheck(false);
-                    }
-                });
-                currentAnimation.start();
-            } else {
-                removeFragmentFromStackInternal(currentFragment);
-                setVisibility(GONE);
-                if (backgroundView != null) {
-                    backgroundView.setVisibility(GONE);
-                }
-            }
+            removeFragmentFromStackInternal(currentFragment);
+            setVisibility(GONE);
        }
    }

@@ -1056,7 +937,6 @@ public class ActionBarLayout extends FrameLayout {
                parent.removeView(previousFragment.actionBar);
            }
            containerView.addView(previousFragment.actionBar);
-            previousFragment.actionBar.setTitleOverlayText(titleOverlayText);
        }
        containerView.addView(fragmentView);
        ViewGroup.LayoutParams layoutParams = fragmentView.getLayoutParams();
@@ -1078,11 +958,7 @@ public class ActionBarLayout extends FrameLayout {
    }

    public void removeFragmentFromStack(BaseFragment fragment) {
-        if (useAlphaAnimations && fragmentsStack.size() == 1 && AndroidUtilities.isTablet()) {
-            closeLastFragment(true);
-        } else {
-            removeFragmentFromStackInternal(fragment);
-        }
+        removeFragmentFromStackInternal(fragment);
    }

    public void removeAllFragments() {
@@ -1092,16 +968,6 @@ public class ActionBarLayout extends FrameLayout {
        }
    }

-    public void rebuildAllFragmentViews(boolean last) {
-        for (int a = 0; a < fragmentsStack.size() - (last ? 0 : 1); a++) {
-            fragmentsStack.get(a).clearViews();
-            fragmentsStack.get(a).setParentLayout(this);
-        }
-        if (delegate != null) {
-            delegate.onRebuildAllFragments(this);
-        }
-    }
-
    public boolean onKeyUp(int keyCode, KeyEvent event) {
        if (keyCode == KeyEvent.KEYCODE_MENU && !checkTransitionAnimation() && !startedTracking && currentActionBar != null) {
            currentActionBar.onMenuButtonPressed();
@@ -1184,35 +1050,10 @@ public class ActionBarLayout extends FrameLayout {
        }
    }

-    public void setUseAlphaAnimations(boolean value) {
-        useAlphaAnimations = value;
-    }
-
-    public void setBackgroundView(View view) {
-        backgroundView = view;
-    }
-
-    public void setDrawerLayoutContainer(DrawerLayoutContainer layout) {
-        drawerLayoutContainer = layout;
-    }
-
-    public DrawerLayoutContainer getDrawerLayoutContainer() {
-        return drawerLayoutContainer;
-    }
-
    public void setRemoveActionBarExtraHeight(boolean value) {
        removeActionBarExtraHeight = value;
    }

-    public void setTitleOverlayText(String text) {
-        titleOverlayText = text;
-        for (BaseFragment fragment : fragmentsStack) {
-            if (fragment.actionBar != null) {
-                fragment.actionBar.setTitleOverlayText(titleOverlayText);
-            }
-        }
-    }
-
    @Override
    public boolean hasOverlappingRendering() {
        return false;
@@ -1,6 +1,6 @@
 /*******************************************************************************
 *
- *                          Messenger Android Frontend
+ *                              Delta Chat Android
 *                        (C) 2013-2016 Nikolai Kudashov
 *                           (C) 2017 Björn Petersen
 *                    Contact: r10s@b44t.com, http://b44t.com
@@ -21,7 +21,7 @@
 ******************************************************************************/


-package com.b44t.ui.ActionBar;
+package com.b44t.messenger.ActionBar;

 import android.content.Context;
 import android.graphics.drawable.Drawable;
@@ -32,7 +32,7 @@ import android.widget.Toast;
 import com.b44t.messenger.AndroidUtilities;
 import com.b44t.messenger.ApplicationLoader;
 import com.b44t.messenger.R;
-import com.b44t.ui.Components.LayoutHelper;
+import com.b44t.messenger.Components.LayoutHelper;

 public class ActionBarMenu extends LinearLayout {

@@ -103,7 +103,7 @@ public class ActionBarMenu extends LinearLayout {
                    case R.drawable.photo_crop:        hint = ApplicationLoader.applicationContext.getString(R.string.CropImage); break;
                    case R.drawable.photo_tools:       hint = ApplicationLoader.applicationContext.getString(R.string.EditImage); break;
                    case R.drawable.ic_ab_search:      hint = ApplicationLoader.applicationContext.getString(R.string.Search); break;
-                    case R.drawable.lock_close:        hint = ApplicationLoader.applicationContext.getString(R.string.Passcode); break;
+                    case R.drawable.ic_ab_lock_screen: hint = ApplicationLoader.applicationContext.getString(R.string.Passcode); break;
                }
                if( hint != null ) {
                    if( s_menuItemHint != null ) {
@@ -1,6 +1,6 @@
 /*******************************************************************************
 *
- *                          Messenger Android Frontend
+ *                              Delta Chat Android
 *                        (C) 2013-2016 Nikolai Kudashov
 *                           (C) 2017 Björn Petersen
 *                    Contact: r10s@b44t.com, http://b44t.com
@@ -21,7 +21,7 @@
 ******************************************************************************/


-package com.b44t.ui.ActionBar;
+package com.b44t.messenger.ActionBar;

 import android.content.Context;
 import android.graphics.Rect;
@@ -47,9 +47,7 @@ import android.widget.TextView;
 import com.b44t.messenger.AndroidUtilities;
 import com.b44t.messenger.LocaleController;
 import com.b44t.messenger.R;
-import com.b44t.ui.Components.LayoutHelper;
-
-import java.lang.reflect.Field;
+import com.b44t.messenger.Components.LayoutHelper;

 public class ActionBarMenuItem extends FrameLayout {

@@ -466,13 +464,7 @@ public class ActionBarMenuItem extends FrameLayout {
                }
            });

-            try {
-                Field mCursorDrawableRes = TextView.class.getDeclaredField("mCursorDrawableRes");
-                mCursorDrawableRes.setAccessible(true);
-                mCursorDrawableRes.set(searchField, R.drawable.search_carret);
-            } catch (Exception e) {
-                //nothing to do
-            }
+
            searchField.setTextIsSelectable(false);
            if( applyHack ) {
                searchField.setOnFocusChangeListener(new View.OnFocusChangeListener() {
@@ -1,6 +1,6 @@
 /*******************************************************************************
 *
- *                          Messenger Android Frontend
+ *                              Delta Chat Android
 *                        (C) 2013-2016 Nikolai Kudashov
 *                           (C) 2017 Björn Petersen
 *                    Contact: r10s@b44t.com, http://b44t.com
@@ -23,7 +23,7 @@

 //Thanks to https://github.com/JakeWharton/ActionBarSherlock/

-package com.b44t.ui.ActionBar;
+package com.b44t.messenger.ActionBar;

 import android.animation.Animator;
 import android.animation.AnimatorSet;
@@ -44,7 +44,7 @@ import android.widget.ScrollView;

 import com.b44t.messenger.AndroidUtilities;
 import com.b44t.messenger.R;
-import com.b44t.ui.Components.LayoutHelper;
+import com.b44t.messenger.Components.LayoutHelper;

 import java.lang.reflect.Field;
 import java.util.HashMap;
@@ -1,6 +1,6 @@
 /*******************************************************************************
 *
- *                          Messenger Android Frontend
+ *                              Delta Chat Android
 *                        (C) 2013-2016 Nikolai Kudashov
 *                           (C) 2017 Björn Petersen
 *                    Contact: r10s@b44t.com, http://b44t.com
@@ -21,7 +21,7 @@
 ******************************************************************************/


-package com.b44t.ui.ActionBar;
+package com.b44t.messenger.ActionBar;

 import android.graphics.Canvas;
 import android.graphics.Color;
@@ -1,6 +1,6 @@
 /*******************************************************************************
 *
- *                          Messenger Android Frontend
+ *                              Delta Chat Android
 *                        (C) 2013-2016 Nikolai Kudashov
 *                           (C) 2017 Björn Petersen
 *                    Contact: r10s@b44t.com, http://b44t.com
@@ -21,9 +21,8 @@
 ******************************************************************************/


-package com.b44t.ui.ActionBar;
+package com.b44t.messenger.ActionBar;

-import android.animation.AnimatorSet;
 import android.app.Activity;
 import android.app.Dialog;
 import android.content.Context;
@@ -286,10 +285,6 @@ public class BaseFragment {

    }

-    protected AnimatorSet onCustomTransitionAnimation(boolean isOpen, final Runnable callback) {
-        return null;
-    }
-
    public void onLowMemory() {

    }
@@ -312,7 +307,7 @@ public class BaseFragment {
        }
        try {
            visibleDialog = dialog;
-            visibleDialog.setCanceledOnTouchOutside(true);
+            //visibleDialog.setCanceledOnTouchOutside(true); -- we do overwrite this from time to time manually, eg. for showing the setup code. so, not all dialogs should be cancelled when touching outside!
            visibleDialog.setOnDismissListener(new DialogInterface.OnDismissListener() {
                @Override
                public void onDismiss(DialogInterface dialog) {
@@ -1,6 +1,6 @@
 /*******************************************************************************
 *
- *                          Messenger Android Frontend
+ *                              Delta Chat Android
 *                        (C) 2013-2016 Nikolai Kudashov
 *                           (C) 2017 Björn Petersen
 *                    Contact: r10s@b44t.com, http://b44t.com
@@ -21,7 +21,7 @@
 ******************************************************************************/


-package com.b44t.ui.ActionBar;
+package com.b44t.messenger.ActionBar;

 import android.animation.Animator;
 import android.animation.AnimatorSet;
@@ -60,7 +60,7 @@ import com.b44t.messenger.AndroidUtilities;
 import com.b44t.messenger.AnimatorListenerAdapterProxy;
 import com.b44t.messenger.LocaleController;
 import com.b44t.messenger.R;
-import com.b44t.ui.Components.LayoutHelper;
+import com.b44t.messenger.Components.LayoutHelper;

 import java.util.ArrayList;

@@ -307,11 +307,7 @@ public class BottomSheet extends Dialog {
            if (containerView != null) {
                if (!fullWidth) {
                    int widthSpec;
-                    if (AndroidUtilities.isTablet()) {
-                        widthSpec = MeasureSpec.makeMeasureSpec((int) (Math.min(AndroidUtilities.displaySize.x, AndroidUtilities.displaySize.y) * 0.8f) + backgroundPaddingLeft * 2, MeasureSpec.EXACTLY);
-                    } else {
-                        widthSpec = MeasureSpec.makeMeasureSpec(isPortrait ? width + backgroundPaddingLeft * 2 : (int) Math.max(width * 0.8f, Math.min(AndroidUtilities.dp(480), width)) + backgroundPaddingLeft * 2, MeasureSpec.EXACTLY);
-                    }
+                    widthSpec = MeasureSpec.makeMeasureSpec(isPortrait ? width + backgroundPaddingLeft * 2 : (int) Math.max(width * 0.8f, Math.min(AndroidUtilities.dp(480), width)) + backgroundPaddingLeft * 2, MeasureSpec.EXACTLY);
                    containerView.measure(widthSpec, MeasureSpec.makeMeasureSpec(height, MeasureSpec.AT_MOST));
                } else {
                    containerView.measure(MeasureSpec.makeMeasureSpec(width + backgroundPaddingLeft * 2, MeasureSpec.EXACTLY), MeasureSpec.makeMeasureSpec(height, MeasureSpec.AT_MOST));
@@ -1,6 +1,6 @@
 /*******************************************************************************
 *
- *                          Messenger Android Frontend
+ *                              Delta Chat Android
 *                        (C) 2013-2016 Nikolai Kudashov
 *                           (C) 2017 Björn Petersen
 *                    Contact: r10s@b44t.com, http://b44t.com
@@ -21,7 +21,7 @@
 ******************************************************************************/


-package com.b44t.ui.ActionBar;
+package com.b44t.messenger.ActionBar;

 import android.content.Context;
 import android.graphics.Canvas;
@@ -1,6 +1,6 @@
 /*******************************************************************************
 *
- *                          Messenger Android Frontend
+ *                              Delta Chat Android
 *                        (C) 2013-2016 Nikolai Kudashov
 *                           (C) 2017 Björn Petersen
 *                    Contact: r10s@b44t.com, http://b44t.com
@@ -21,7 +21,7 @@
 ******************************************************************************/


-package com.b44t.ui.ActionBar;
+package com.b44t.messenger.ActionBar;

 import android.content.Context;
 import android.content.res.ColorStateList;
@@ -39,7 +39,7 @@ import android.os.Build;
 import com.b44t.messenger.AndroidUtilities;
 import com.b44t.messenger.ApplicationLoader;
 import com.b44t.messenger.R;
-import com.b44t.ui.Components.ChatAttachAlert;
+import com.b44t.messenger.Components.ChatAttachAlert;

 public class Theme {

@@ -60,22 +60,17 @@ public class Theme {

    public static final int ATTACH_SHEET_TEXT_COLOR = 0xff757575;

-    public static final int DIALOGS_TITLE_TEXT_COLOR = 0xff000000;
-    public static final int DIALOGS_MESSAGE_TEXT_COLOR = 0xff8f8f8f;
-    public static final int DIALOGS_NAME_TEXT_COLOR = 0xff555555;
-    public static final int DIALOGS_SELF_TEXT_COLOR = 0xff00a60e; // from encrypted chat title: 0xff00a60e, alternative: 0xff3c912e
-    public static final int DIALOGS_PRINTING_TEXT_COLOR = 0xff4d83b3;
-    public static final int DIALOGS_DRAFT_TEXT_COLOR = 0xffdd4b39;
+    public static final int CHATLIST_BACKGROUND_COLOR = 0xffffffff;
+    public static final int CHATLIST_DEADDROP_BACKGROUND_COLOR = 0xffd3d3d3;
+    public static final int CHATLIST_TITLE_TEXT_COLOR = 0xff000000;
+    public static final int CHATLIST_MESSAGE_TEXT_COLOR = 0xff8f8f8f;
+    public static final int CHATLIST_NAME_TEXT_COLOR = 0xff555555;
+    public static final int CHATLIST_SELF_TEXT_COLOR = 0xff00a60e; // from encrypted chat title: 0xff00a60e, alternative: 0xff3c912e
+    public static final int CHATLIST_DRAFT_TEXT_COLOR = 0xffdd4b39;

    public static final int CHAT_BOTTOM_OVERLAY_TEXT_COLOR = 0xff7f7f7f;
    public static final int CHAT_EMPTY_VIEW_TEXT_COLOR = 0xffffffff;

-    public static final int STICKERS_SHEET_TITLE_TEXT_COLOR = 0xff212121;
-    public static final int STICKERS_SHEET_SEND_TEXT_COLOR = 0xff3a8ccf;
-    public static final int STICKERS_SHEET_ADD_TEXT_COLOR = 0xff3a8ccf;
-    public static final int STICKERS_SHEET_CLOSE_TEXT_COLOR = 0xff3a8ccf;
-    public static final int STICKERS_SHEET_REMOVE_TEXT_COLOR = 0xffcd5a5a;
-
    public static final int MSG_SELECTED_BACKGROUND_COLOR = 0x6633b5e5;
    public static final int MSG_STICKER_NAME_TEXT_COLOR = 0xffffffff;
    public static final int MSG_IN_TIME_N_FWD_TEXT_COLOR = 0xff9ea7b0;
@@ -110,6 +105,9 @@ public class Theme {
    public static Drawable systemDrawable;
    public static Drawable timeBackgroundDrawable;
    public static Drawable timeStickerBackgroundDrawable;
+    public static Drawable encrOutDrawable;
+    public static Drawable encrInDrawable;
+    public static Drawable encrMediaDrawable;

    public static Drawable[] cornerOuter = new Drawable[4];
    public static Drawable[] cornerInner = new Drawable[4];
@@ -147,6 +145,10 @@ public class Theme {
            timeStickerBackgroundDrawable = context.getResources().getDrawable(R.drawable.phototime2);
            systemDrawable = context.getResources().getDrawable(R.drawable.system);

+            encrInDrawable = context.getResources().getDrawable(R.drawable.msg_encr_in);
+            encrOutDrawable = context.getResources().getDrawable(R.drawable.msg_encr_out);
+            encrMediaDrawable = context.getResources().getDrawable(R.drawable.msg_encr_media);
+
            inlistDrawable[INLIST_FILE]        = context.getResources().getDrawable(R.drawable.attach_file_inlist);
            inlistDrawable[INLIST_PLAY]        = context.getResources().getDrawable(R.drawable.attach_audio_inlist_play);
            inlistDrawable[INLIST_TRANSP_PLAY] = context.getResources().getDrawable(R.drawable.video_play);
@@ -1,6 +1,6 @@
 /*******************************************************************************
 *
- *                          Messenger Android Frontend
+ *                              Delta Chat Android
 *                        (C) 2013-2016 Nikolai Kudashov
 *                           (C) 2017 Björn Petersen
 *                    Contact: r10s@b44t.com, http://b44t.com
@@ -51,6 +51,7 @@ import android.support.v4.content.FileProvider;
 import android.text.SpannableStringBuilder;
 import android.text.Spanned;
 import android.text.style.ForegroundColorSpan;
+import android.text.style.StyleSpan;
 import android.util.DisplayMetrics;
 import android.util.Log;
 import android.util.StateSet;
@@ -60,15 +61,11 @@ import android.view.View;
 import android.view.WindowManager;
 import android.view.inputmethod.InputMethodManager;
 import android.webkit.MimeTypeMap;
-import android.widget.AbsListView;
-import android.widget.EdgeEffect;
-import android.widget.EditText;
 import android.widget.ListView;
-import android.widget.TextView;
 import android.widget.Toast;

-import com.b44t.ui.Components.ForegroundDetector;
-import com.b44t.ui.Components.TypefaceSpan;
+import com.b44t.messenger.Components.ForegroundDetector;
+import com.b44t.messenger.Components.TypefaceSpan;

 import java.io.ByteArrayOutputStream;
 import java.io.File;
@@ -83,9 +80,7 @@ import java.nio.channels.FileChannel;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
-import java.util.Hashtable;
 import java.util.Locale;
-import java.util.regex.Pattern;

 public class AndroidUtilities {

@@ -98,35 +93,16 @@ public class AndroidUtilities {
    public static DisplayMetrics displayMetrics = new DisplayMetrics();
    public static int leftBaseline;
    public static boolean usingHardwareInput;
-    private static Boolean isTablet = null;
    private static int adjustOwnerClassGuid = 0;

-    static {
-        try {
-            final String GOOD_IRI_CHAR = "a-zA-Z0-9\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF";
-            final Pattern IP_ADDRESS = Pattern.compile(
-                    "((25[0-5]|2[0-4][0-9]|[0-1][0-9]{2}|[1-9][0-9]|[1-9])\\.(25[0-5]|2[0-4]"
-                            + "[0-9]|[0-1][0-9]{2}|[1-9][0-9]|[1-9]|0)\\.(25[0-5]|2[0-4][0-9]|[0-1]"
-                            + "[0-9]{2}|[1-9][0-9]|[1-9]|0)\\.(25[0-5]|2[0-4][0-9]|[0-1][0-9]{2}"
-                            + "|[1-9][0-9]|[0-9]))");
-            final String IRI = "[" + GOOD_IRI_CHAR + "]([" + GOOD_IRI_CHAR + "\\-]{0,61}[" + GOOD_IRI_CHAR + "]){0,1}";
-            final String GOOD_GTLD_CHAR = "a-zA-Z\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF";
-            final String GTLD = "[" + GOOD_GTLD_CHAR + "]{2,63}";
-            final String HOST_NAME = "(" + IRI + "\\.)+" + GTLD;
-            final Pattern DOMAIN_NAME = Pattern.compile("(" + HOST_NAME + "|" + IP_ADDRESS + ")");
-        } catch (Exception e) {
-
-        }
-    }
-
    static {
        density = ApplicationLoader.applicationContext.getResources().getDisplayMetrics().density;
-        leftBaseline = isTablet() ? 80 : 72;
+        leftBaseline = 72;
        checkDisplaySize();
    }

    public static void requestAdjustResize(Activity activity, int classGuid) {
-        if (activity == null || isTablet()) {
+        if (activity == null) {
            return;
        }
        activity.getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE);
@@ -134,7 +110,7 @@ public class AndroidUtilities {
    }

    public static void removeAdjustResize(Activity activity, int classGuid) {
-        if (activity == null || isTablet()) {
+        if (activity == null ) {
            return;
        }
        if (adjustOwnerClassGuid == classGuid) {
@@ -330,43 +306,6 @@ public class AndroidUtilities {
        ApplicationLoader.applicationHandler.removeCallbacks(runnable);
    }

-    public static boolean isTablet() {
-        /* -- we do not make any special for tablet or not. _If_ sth. like this is desired, check for an appropriate screen size.
-        if (isTablet == null) {
-            isTablet = ApplicationLoader.applicationContext.getResources().getBoolean(R.bool.isTablet);
-        }
-        return isTablet;
-        */
-        return false;
-    }
-
-    public static boolean isSmallTablet() {
-        /*
-        float minSide = Math.min(displaySize.x, displaySize.y) / density;
-        return minSide <= 700;
-        */
-        return false;
-    }
-
-    public static int getMinTabletSide() {
-        if (!isSmallTablet()) {
-            int smallSide = Math.min(displaySize.x, displaySize.y);
-            int leftSide = smallSide * 35 / 100;
-            if (leftSide < dp(320)) {
-                leftSide = dp(320);
-            }
-            return smallSide - leftSide;
-        } else {
-            int smallSide = Math.min(displaySize.x, displaySize.y);
-            int maxSide = Math.max(displaySize.x, displaySize.y);
-            int leftSide = maxSide * 35 / 100;
-            if (leftSide < dp(320)) {
-                leftSide = dp(320);
-            }
-            return Math.min(smallSide, maxSide - leftSide);
-        }
-    }
-
    public static int getPhotoSize() {
        if (photoSize == null) {
            if (Build.VERSION.SDK_INT >= 16) {
@@ -378,19 +317,6 @@ public class AndroidUtilities {
        return photoSize;
    }

-    public static void clearCursorDrawable(EditText editText) {
-        if (editText == null) {
-            return;
-        }
-        try {
-            Field mCursorDrawableRes = TextView.class.getDeclaredField("mCursorDrawableRes");
-            mCursorDrawableRes.setAccessible(true);
-            mCursorDrawableRes.setInt(editText, 0);
-        } catch (Exception e) {
-
-        }
-    }
-
    private static Intent createShortcutIntent(int did, Bitmap bitmap) {
        Intent shortcutIntent = new Intent(ApplicationLoader.applicationContext, OpenChatReceiver.class);

@@ -509,59 +435,67 @@ public class AndroidUtilities {
        }
    }

-    public static final int FLAG_TAG_BR = 1;
-    public static final int FLAG_TAG_BOLD = 2;
-    public static final int FLAG_TAG_COLOR = 4;
-    public static final int FLAG_TAG_ALL = FLAG_TAG_BR | FLAG_TAG_BOLD | FLAG_TAG_COLOR;
-
    public static SpannableStringBuilder replaceTags(String str) {
-        return replaceTags(str, FLAG_TAG_ALL);
-    }
-
-    public static SpannableStringBuilder replaceTags(String str, int flag) {
        try {
            int start;
            int end;
            StringBuilder stringBuilder = new StringBuilder(str);
-            if ((flag & FLAG_TAG_BR) != 0) {
-                while ((start = stringBuilder.indexOf("<br>")) != -1) {
-                    stringBuilder.replace(start, start + 4, "\n");
-                }
-                while ((start = stringBuilder.indexOf("<br/>")) != -1) {
-                    stringBuilder.replace(start, start + 5, "\n");
-                }
+
+            // breaks
+            while ((start = stringBuilder.indexOf("<br>")) != -1) {
+                stringBuilder.replace(start, start + 4, "\n");
            }
+            while ((start = stringBuilder.indexOf("<br/>")) != -1) {
+                stringBuilder.replace(start, start + 5, "\n");
+            }
+
+            // bold
            ArrayList<Integer> bolds = new ArrayList<>();
-            if ((flag & FLAG_TAG_BOLD) != 0) {
-                while ((start = stringBuilder.indexOf("<b>")) != -1) {
-                    stringBuilder.replace(start, start + 3, "");
-                    end = stringBuilder.indexOf("</b>");
-                    if (end == -1) {
-                        end = stringBuilder.indexOf("<b>");
-                    }
-                    stringBuilder.replace(end, end + 4, "");
-                    bolds.add(start);
-                    bolds.add(end);
+            while ((start = stringBuilder.indexOf("<b>")) != -1) {
+                stringBuilder.replace(start, start + 3, "");
+                end = stringBuilder.indexOf("</b>");
+                if (end == -1) {
+                    end = stringBuilder.indexOf("<b>");
                }
+                stringBuilder.replace(end, end + 4, "");
+                bolds.add(start);
+                bolds.add(end);
            }
+
+            // italics
+            ArrayList<Integer> italics = new ArrayList<>();
+            while ((start = stringBuilder.indexOf("<i>")) != -1) {
+                stringBuilder.replace(start, start + 3, "");
+                end = stringBuilder.indexOf("</i>");
+                if (end == -1) {
+                    end = stringBuilder.indexOf("<i>");
+                }
+                stringBuilder.replace(end, end + 4, "");
+                italics.add(start);
+                italics.add(end);
+            }
+
+            // color - used eg. by the message preview when following a mailto:-link
            ArrayList<Integer> colors = new ArrayList<>();
-            if ((flag & FLAG_TAG_COLOR) != 0) { // used eg. by the message preview when following a mailto:-link
-                while ((start = stringBuilder.indexOf("<c#")) != -1) {
-                    stringBuilder.replace(start, start + 2, "");
-                    end = stringBuilder.indexOf(">", start);
-                    int color = Color.parseColor(stringBuilder.substring(start, end));
-                    stringBuilder.replace(start, end + 1, "");
-                    end = stringBuilder.indexOf("</c>");
-                    stringBuilder.replace(end, end + 4, "");
-                    colors.add(start);
-                    colors.add(end);
-                    colors.add(color);
-                }
+            while ((start = stringBuilder.indexOf("<c#")) != -1) {
+                stringBuilder.replace(start, start + 2, "");
+                end = stringBuilder.indexOf(">", start);
+                int color = Color.parseColor(stringBuilder.substring(start, end));
+                stringBuilder.replace(start, end + 1, "");
+                end = stringBuilder.indexOf("</c>");
+                stringBuilder.replace(end, end + 4, "");
+                colors.add(start);
+                colors.add(end);
+                colors.add(color);
            }
+
            SpannableStringBuilder spannableStringBuilder = new SpannableStringBuilder(stringBuilder);
            for (int a = 0; a < bolds.size() / 2; a++) {
                spannableStringBuilder.setSpan(new TypefaceSpan(Typeface.DEFAULT_BOLD), bolds.get(a * 2), bolds.get(a * 2 + 1), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
            }
+            for (int a = 0; a < italics.size() / 2; a++) {
+                spannableStringBuilder.setSpan(new StyleSpan(Typeface.ITALIC), italics.get(a * 2), italics.get(a * 2 + 1), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
+            }
            for (int a = 0; a < colors.size() / 3; a++) {
                spannableStringBuilder.setSpan(new ForegroundColorSpan(colors.get(a * 3 + 2)), colors.get(a * 3), colors.get(a * 3 + 1), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
            }
@@ -886,8 +820,8 @@ public class AndroidUtilities {
    public static void openForViewOrShare(Activity activity, int msg_id, String cmd)
    {
        MrMsg msg = MrMailbox.getMsg(msg_id);
-        String path = msg.getParam('f', "");
-        String mimeType = getMimetype(path, msg.getParam('m', "application/octet-stream"));
+        String path = msg.getFile();
+        String mimeType = getMimetype(path, msg.getFilemime());
        try {
            File file = new File(path);
            if( !file.exists() ) {
@@ -958,8 +892,8 @@ public class AndroidUtilities {

        MrMsg        msg = MrMailbox.getMsg(msg_id);
        final int    msg_type = msg.getType();
-        String       msg_file_path = msg.getParam('f', "");
-        final String msg_mime = msg.getParam('m', "application/octet-stream");
+        String       msg_file_path = msg.getFile();
+        final String msg_mime = msg.getFilemime();
        final String msg_file_name = msg.getFilename();
        final File sourceFile = new File(msg_file_path);
        if( !sourceFile.exists() ) {
@@ -1018,7 +952,7 @@ public class AndroidUtilities {
                        if (copied) {
                            if ( add_to_download_manager ) {
                                DownloadManager downloadManager = (DownloadManager) ApplicationLoader.applicationContext.getSystemService(Context.DOWNLOAD_SERVICE);
-                                downloadManager.addCompletedDownload(destPathNFile.getName(), destPathNFile.getName(), false, getMimetype(msg_file_name, msg_mime), destPathNFile.getAbsolutePath(), destPathNFile.length(), true);
+                                downloadManager.addCompletedDownload(destPathNFile.getName(), destPathNFile.getName(), true, getMimetype(msg_file_name, msg_mime), destPathNFile.getAbsolutePath(), destPathNFile.length(), true);
                            } else {
                                addMediaToGallery(Uri.fromFile(destPathNFile));
                            }
@@ -1,6 +1,6 @@
 /*******************************************************************************
 *
- *                          Messenger Android Frontend
+ *                              Delta Chat Android
 *                        (C) 2013-2016 Nikolai Kudashov
 *                           (C) 2017 Björn Petersen
 *                    Contact: r10s@b44t.com, http://b44t.com
@@ -1,6 +1,6 @@
 /*******************************************************************************
 *
- *                          Messenger Android Frontend
+ *                              Delta Chat Android
 *                        (C) 2013-2016 Nikolai Kudashov
 *                           (C) 2017 Björn Petersen
 *                    Contact: r10s@b44t.com, http://b44t.com
@@ -24,9 +24,7 @@
 package com.b44t.messenger;

 import android.app.Activity;
-import android.app.AlarmManager;
 import android.app.Application;
-import android.app.PendingIntent;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
@@ -40,11 +38,9 @@ import android.net.ConnectivityManager;
 import android.net.NetworkInfo;
 import android.os.Handler;
 import android.os.PowerManager;
-import android.os.SystemClock;
 import android.util.Log;

-import com.b44t.ui.Components.ForegroundDetector;
-import com.b44t.ui.SettingsAdvActivity;
+import com.b44t.messenger.Components.ForegroundDetector;

 import java.io.File;

@@ -72,7 +68,7 @@ public class ApplicationLoader extends Application {
    }

    public static int getServiceMessageColor() {
-        return 0x44000000; // this color is used as a background for date headlines, empty chat hints and in the drawer
+        return 0x44000000; // this color is used as a background for date headlines and empty chat hints
    }

    public static void loadWallpaper() {
@@ -182,7 +178,7 @@ public class ApplicationLoader extends Application {
            e.printStackTrace();
        }

-        // track screen on/ff
+        // track screen on/off
        try {
            final IntentFilter filter = new IntentFilter(Intent.ACTION_SCREEN_ON);
            filter.addAction(Intent.ACTION_SCREEN_OFF);
@@ -207,9 +203,10 @@ public class ApplicationLoader extends Application {

        // make sure, the notifications for the "deaddrop" dialog are muted by default
        SharedPreferences notificationPreferences = ApplicationLoader.applicationContext.getSharedPreferences("Notifications", Activity.MODE_PRIVATE);
-        if( notificationPreferences.getInt("notify2_"+MrChat.MR_CHAT_ID_DEADDROP, 666)==666 ) {
+        if( notificationPreferences.getInt("deaddrop_initialized", 0)!=1 ) {
            SharedPreferences.Editor editor = notificationPreferences.edit();
            editor.putInt("notify2_"+MrChat.MR_CHAT_ID_DEADDROP, 2);
+            editor.putInt("deaddrop_initialized", 1);
            editor.apply();
        }

@@ -223,10 +220,11 @@ public class ApplicationLoader extends Application {

        // create other default objects
        SharedPreferences mainPreferences = ApplicationLoader.applicationContext.getSharedPreferences("mainconfig", Activity.MODE_PRIVATE);
-        fontSize = mainPreferences.getInt("msg_font_size", SettingsAdvActivity.defMsgFontSize());
+        fontSize = mainPreferences.getInt("msg_font_size", SettingsAdvFragment.defMsgFontSize());

        ImageLoader.getInstance();
        MediaController.getInstance();
+        NotificationsController.getInstance(); // force instace creation which also does some init stuff
    }

    @Override
@@ -1,6 +1,6 @@
 /*******************************************************************************
 *
- *                          Messenger Android Frontend
+ *                              Delta Chat Android
 *                           (C) 2017 Björn Petersen
 *                    Contact: r10s@b44t.com, http://b44t.com
 *
@@ -1,6 +1,6 @@
 /*******************************************************************************
 *
- *                          Messenger Android Frontend
+ *                              Delta Chat Android
 *                        (C) 2013-2016 Nikolai Kudashov
 *                           (C) 2017 Björn Petersen
 *                    Contact: r10s@b44t.com, http://b44t.com
@@ -20,7 +20,7 @@
 *
 ******************************************************************************/

-package com.b44t.ui;
+package com.b44t.messenger;

 import android.content.Context;
 import android.database.Cursor;
@@ -32,24 +32,13 @@ import android.widget.AdapterView;
 import android.widget.FrameLayout;
 import android.widget.ListView;

-import com.b44t.messenger.AndroidUtilities;
-import com.b44t.messenger.LocaleController;
-import com.b44t.messenger.MediaController;
-import com.b44t.messenger.MessageObject;
-import com.b44t.messenger.MrContact;
-import com.b44t.messenger.NotificationCenter;
-import com.b44t.messenger.ApplicationLoader;
-import com.b44t.messenger.FileLoader;
-import com.b44t.messenger.R;
-import com.b44t.messenger.TLRPC;
-import com.b44t.messenger.Utilities;
-import com.b44t.ui.ActionBar.ActionBar;
-import com.b44t.ui.ActionBar.BaseFragment;
-import com.b44t.ui.Adapters.BaseFragmentAdapter;
-import com.b44t.ui.Cells.AudioCell;
-import com.b44t.ui.Components.EmptyTextProgressView;
-import com.b44t.ui.Components.LayoutHelper;
-import com.b44t.ui.Components.PickerBottomLayout;
+import com.b44t.messenger.ActionBar.ActionBar;
+import com.b44t.messenger.ActionBar.BaseFragment;
+import com.b44t.messenger.Components.BaseFragmentAdapter;
+import com.b44t.messenger.Cells.AudioCell;
+import com.b44t.messenger.Components.EmptyTextProgressView;
+import com.b44t.messenger.Components.LayoutHelper;
+import com.b44t.messenger.Components.PickerBottomLayout;

 import java.io.File;
 import java.util.ArrayList;
@@ -1,6 +1,6 @@
 /*******************************************************************************
 *
- *                          Messenger Android Frontend
+ *                              Delta Chat Android
 *                        (C) 2013-2016 Nikolai Kudashov
 *                           (C) 2017 Björn Petersen
 *                    Contact: r10s@b44t.com, http://b44t.com
@@ -38,7 +38,7 @@ public class AutoMessageHeardReceiver extends BroadcastReceiver {
        if (dialog_id == 0 || max_id == 0) {
            return;
        }
-        MrMailbox.markseenChat((int)dialog_id);
+        MrMailbox.marknoticedChat((int)dialog_id);
        NotificationsController.getInstance().removeSeenMessages();
    }
 }
@@ -1,6 +1,6 @@
 /*******************************************************************************
 *
- *                          Messenger Android Frontend
+ *                              Delta Chat Android
 *                        (C) 2013-2016 Nikolai Kudashov
 *                           (C) 2017 Björn Petersen
 *                    Contact: r10s@b44t.com, http://b44t.com
@@ -49,7 +49,7 @@ public class AutoMessageReplyReceiver extends BroadcastReceiver {
            return;
        }
        SendMessagesHelper.getInstance().sendMessageText(text.toString(), dialog_id, null);
-        MrMailbox.markseenChat((int)dialog_id);
+        MrMailbox.marknoticedChat((int)dialog_id);
        NotificationsController.getInstance().removeSeenMessages();
    }
 }
@@ -1,6 +1,6 @@
 /*******************************************************************************
 *
- *                          Messenger Android Frontend
+ *                              Delta Chat Android
 *                        (C) 2013-2016 Nikolai Kudashov
 *                           (C) 2017 Björn Petersen
 *                    Contact: r10s@b44t.com, http://b44t.com
@@ -1,6 +1,6 @@
 /*******************************************************************************
 *
- *                          Messenger Android Frontend
+ *                              Delta Chat Android
 *                        (C) 2013-2016 Nikolai Kudashov
 *                           (C) 2017 Björn Petersen
 *                    Contact: r10s@b44t.com, http://b44t.com
@@ -21,7 +21,7 @@
 ******************************************************************************/


-package com.b44t.ui;
+package com.b44t.messenger;

 import android.app.AlertDialog;
 import android.content.Context;
@@ -36,18 +36,12 @@ import android.widget.FrameLayout;
 import android.widget.ListView;
 import android.widget.TextView;

-import com.b44t.messenger.ApplicationLoader;
-import com.b44t.messenger.LocaleController;
-import com.b44t.messenger.MrContact;
-import com.b44t.messenger.MrMailbox;
-import com.b44t.messenger.NotificationCenter;
-import com.b44t.messenger.R;
-import com.b44t.ui.Adapters.BaseFragmentAdapter;
-import com.b44t.ui.Cells.UserCell;
-import com.b44t.ui.ActionBar.ActionBar;
-import com.b44t.ui.ActionBar.ActionBarMenu;
-import com.b44t.ui.ActionBar.BaseFragment;
-import com.b44t.ui.Components.LayoutHelper;
+import com.b44t.messenger.Components.BaseFragmentAdapter;
+import com.b44t.messenger.Cells.UserCell;
+import com.b44t.messenger.ActionBar.ActionBar;
+import com.b44t.messenger.ActionBar.ActionBarMenu;
+import com.b44t.messenger.ActionBar.BaseFragment;
+import com.b44t.messenger.Components.LayoutHelper;

 public class BlockedUsersActivity extends BaseFragment implements NotificationCenter.NotificationCenterDelegate, ContactsActivity.ContactsActivityDelegate {

@@ -1,6 +1,6 @@
 /*******************************************************************************
 *
- *                          Messenger Android Frontend
+ *                              Delta Chat Android
 *                           (C) 2017 Björn Petersen
 *                    Contact: r10s@b44t.com, http://b44t.com
 *
@@ -1,6 +1,6 @@
 /*******************************************************************************
 *
- *                          Messenger Android Frontend
+ *                              Delta Chat Android
 *                        (C) 2013-2016 Nikolai Kudashov
 *                           (C) 2017 Björn Petersen
 *                    Contact: r10s@b44t.com, http://b44t.com
@@ -21,7 +21,7 @@
 ******************************************************************************/


-package com.b44t.ui.Cells;
+package com.b44t.messenger.Cells;

 import android.content.Context;
 import android.graphics.Paint;
@@ -38,8 +38,8 @@ import com.b44t.messenger.LocaleController;
 import com.b44t.messenger.MediaController;
 import com.b44t.messenger.MessageObject;
 import com.b44t.messenger.R;
-import com.b44t.ui.Components.CheckBoxView;
-import com.b44t.ui.Components.LayoutHelper;
+import com.b44t.messenger.Components.CheckBoxView;
+import com.b44t.messenger.Components.LayoutHelper;

 public class AudioCell extends FrameLayout {

@@ -1,6 +1,6 @@
 /*******************************************************************************
 *
- *                          Messenger Android Frontend
+ *                              Delta Chat Android
 *                        (C) 2013-2016 Nikolai Kudashov
 *                           (C) 2017 Björn Petersen
 *                    Contact: r10s@b44t.com, http://b44t.com
@@ -21,7 +21,7 @@
 ******************************************************************************/


-package com.b44t.ui.Cells;
+package com.b44t.messenger.Cells;

 import android.content.Context;
 import android.graphics.drawable.Drawable;
@@ -1,6 +1,6 @@
 /*******************************************************************************
 *
- *                          Messenger Android Frontend
+ *                              Delta Chat Android
 *                        (C) 2013-2016 Nikolai Kudashov
 *                           (C) 2017 Björn Petersen
 *                    Contact: r10s@b44t.com, http://b44t.com
@@ -21,7 +21,7 @@
 ******************************************************************************/


-package com.b44t.ui.Cells;
+package com.b44t.messenger.Cells;

 import android.content.Context;
 import android.graphics.Canvas;
@@ -35,7 +35,7 @@ import android.view.MotionEvent;
 import com.b44t.messenger.AndroidUtilities;
 import com.b44t.messenger.ApplicationLoader;
 import com.b44t.messenger.MessageObject;
-import com.b44t.ui.ActionBar.Theme;
+import com.b44t.messenger.ActionBar.Theme;

 public class ChatActionCell extends BaseCell {

@@ -1,6 +1,6 @@
 /*******************************************************************************
 *
- *                          Messenger Android Frontend
+ *                              Delta Chat Android
 *                        (C) 2013-2016 Nikolai Kudashov
 *                           (C) 2017 Björn Petersen
 *                    Contact: r10s@b44t.com, http://b44t.com
@@ -21,7 +21,7 @@
 ******************************************************************************/


-package com.b44t.ui.Cells;
+package com.b44t.messenger.Cells;

 import android.annotation.SuppressLint;
 import android.content.Context;
@@ -55,16 +55,16 @@ import com.b44t.messenger.MessageObject;
 import com.b44t.messenger.MrChat;
 import com.b44t.messenger.MrContact;
 import com.b44t.messenger.MrMailbox;
-import com.b44t.messenger.MrPoortext;
+import com.b44t.messenger.MrLot;
 import com.b44t.messenger.R;
 import com.b44t.messenger.TLRPC;
-import com.b44t.ui.Components.AvatarDrawable;
-import com.b44t.ui.Components.LinkPath;
-import com.b44t.ui.Components.SeekBar;
-import com.b44t.ui.Components.SeekBarWaveform;
-import com.b44t.ui.Components.StaticLayoutEx;
-import com.b44t.ui.ActionBar.Theme;
-import com.b44t.ui.PhotoViewer;
+import com.b44t.messenger.Components.AvatarDrawable;
+import com.b44t.messenger.Components.LinkPath;
+import com.b44t.messenger.Components.SeekBar;
+import com.b44t.messenger.Components.SeekBarWaveform;
+import com.b44t.messenger.Components.StaticLayoutEx;
+import com.b44t.messenger.ActionBar.Theme;
+import com.b44t.messenger.PhotoViewer;

 import java.util.ArrayList;
 import java.util.Locale;
@@ -75,6 +75,7 @@ public class ChatMessageCell extends BaseCell implements SeekBar.SeekBarDelegate

    public interface ChatMessageCellDelegate {
        void didPressedUserAvatar(ChatMessageCell cell, TLRPC.User user);
+        void didPressedSetupMessage(ChatMessageCell cell);
        void didLongPressed(ChatMessageCell cell);
        void didPressedUrl(MessageObject messageObject, ClickableSpan url, boolean longPress);
        void didPressedImage(ChatMessageCell cell);
@@ -197,8 +198,6 @@ public class ChatMessageCell extends BaseCell implements SeekBar.SeekBarDelegate

    private static TextPaint timePaint;
    private static TextPaint namePaint;
-    private static TextPaint forwardNamePaint;
-    private static TextPaint forward2NamePaint;

    private int backgroundWidth = 100;

@@ -208,7 +207,8 @@ public class ChatMessageCell extends BaseCell implements SeekBar.SeekBarDelegate
    private ImageReceiver avatarImage;
    private AvatarDrawable avatarDrawable;
    private boolean avatarPressed;
-    private boolean forwardNamePressed;
+
+    private boolean setupmessagePressed;

    private boolean drawNewchatButton;
    private boolean newchatPressed;
@@ -223,26 +223,23 @@ public class ChatMessageCell extends BaseCell implements SeekBar.SeekBarDelegate
    private boolean drawName;
    private boolean drawNameLayout;

-    private StaticLayout[] forwardedNameLayout = new StaticLayout[2];
+    private boolean allowForwardedName;
+    private static TextPaint forwardedNamePaint;
+    private StaticLayout forwardedNameLayout;
    private int forwardedNameWidth;
-    private boolean drawForwardedName;
-    private int forwardNameX;
-    private int forwardNameY;
-    private float forwardNameOffsetX[] = new float[2];
+    private float forwardedNameOffsetX;

    private StaticLayout timeLayout;
-    private int timeWidth;
-    private int timeTextWidth;
+    private int timeWidth; // includes timeEncrWidth
+    private int timeEncrWidth;
    private int timeX;
    private String currentTimeString;
    private boolean drawTime = true;

    private TLRPC.User currentUser;
-    private final Object currentChat = null;
    private TLRPC.FileLocation currentPhoto;
    private String currentNameString;

-    private String currentForwardNameString;

    private ChatMessageCellDelegate delegate;

@@ -287,12 +284,8 @@ public class ChatMessageCell extends BaseCell implements SeekBar.SeekBarDelegate
            namePaint.setTypeface(Typeface.DEFAULT_BOLD);
            namePaint.setTextSize(dp(14));

-            forwardNamePaint = new TextPaint(TextPaint.ANTI_ALIAS_FLAG);
-            forwardNamePaint.setTextSize(dp(14));
-
-            forward2NamePaint = new TextPaint(TextPaint.ANTI_ALIAS_FLAG);
-            forward2NamePaint.setTypeface(Typeface.DEFAULT_BOLD);
-            forward2NamePaint.setTextSize(dp(14));
+            forwardedNamePaint = new TextPaint(TextPaint.ANTI_ALIAS_FLAG);
+            forwardedNamePaint.setTextSize(dp(14));
        }
        avatarImage = new ImageReceiver(this);
        avatarImage.setRoundRadius(dp(21));
@@ -524,7 +517,7 @@ public class ChatMessageCell extends BaseCell implements SeekBar.SeekBarDelegate
                        imagePressed = true;
                        result = true;
                    }
-                } else if (currentMessageObject.type != MessageObject.MO_TYPE13_STICKER || currentMessageObject.getInputStickerSet() != null) {
+                } else if (currentMessageObject.type != MessageObject.MO_TYPE13_STICKER ) {
                    if (x >= photoImage.getImageX() && x <= photoImage.getImageX() + backgroundWidth && y >= photoImage.getImageY() && y <= photoImage.getImageY() + photoImage.getImageHeight()) {
                        imagePressed = true;
                        result = true;
@@ -664,14 +657,15 @@ public class ChatMessageCell extends BaseCell implements SeekBar.SeekBarDelegate
                    if (isAvatarVisible && avatarImage.isInsideImage(x, y)) {
                        avatarPressed = true;
                        result = true;
-                    } else if (drawForwardedName && forwardedNameLayout[0] != null && x >= forwardNameX && x <= forwardNameX + forwardedNameWidth && y >= forwardNameY && y <= forwardNameY + dp(32)) {
-                        forwardNamePressed = true;
-                        result = true;
                    } else if (drawNewchatButton && x >= newchatStartX && x <= newchatStartX + dp(40) && y >= newchatStartY && y <= newchatStartY + dp(32)) {
                        newchatPressed = true;
                        result = true;
                        invalidate();
+                    } else if( currentMessageObject.messageOwner.is_setup_message && currentBackgroundDrawable.getBounds().contains((int)x, (int)y) ) {
+                        setupmessagePressed = true;
+                        result = true;
                    }
+
                    if (result) {
                        startCheckLongPress();
                    }
@@ -696,14 +690,16 @@ public class ChatMessageCell extends BaseCell implements SeekBar.SeekBarDelegate
                            avatarPressed = false;
                        }
                    }
-                } else if (forwardNamePressed) {
+                } else if(setupmessagePressed) {
                    if (event.getAction() == MotionEvent.ACTION_UP) {
-                        forwardNamePressed = false;
-                    } else if (event.getAction() == MotionEvent.ACTION_CANCEL) {
-                        forwardNamePressed = false;
+                        setupmessagePressed = false;
+                        delegate.didPressedSetupMessage(this);
+                    }
+                    else if(event.getAction() == MotionEvent.ACTION_CANCEL) {
+                        setupmessagePressed = false;
                    } else if (event.getAction() == MotionEvent.ACTION_MOVE) {
-                        if (!(x >= forwardNameX && x <= forwardNameX + forwardedNameWidth && y >= forwardNameY && y <= forwardNameY + dp(32))) {
-                            forwardNamePressed = false;
+                        if( !currentBackgroundDrawable.getBounds().contains((int)x, (int)y) ) {
+                            setupmessagePressed = false;
                        }
                    }
                } else if (newchatPressed) {
@@ -867,7 +863,7 @@ public class ChatMessageCell extends BaseCell implements SeekBar.SeekBarDelegate
    }

    private boolean isUserDataChanged() {
-        if (currentMessageObject == null || currentUser == null && currentChat == null) {
+        if (currentMessageObject == null || currentUser == null) {
            return false;
        }
        if (lastSendState != currentMessageObject.messageOwner.send_state) {
@@ -878,12 +874,9 @@ public class ChatMessageCell extends BaseCell implements SeekBar.SeekBarDelegate
        }

        TLRPC.User newUser = null;
-        final TLRPC.Chat newChat = null;
        if (currentMessageObject.isFromUser()) {
            newUser = MrMailbox.getUser(currentMessageObject.messageOwner.from_id);
-        } /*else if (currentMessageObject.messageOwner.post) {
-            newChat = MessagesController.getInstance().getChat(currentMessageObject.messageOwner.to_id.channel_id);
-        }*/
+        }
        TLRPC.FileLocation newPhoto = null;

        if (isAvatarVisible) {
@@ -900,8 +893,6 @@ public class ChatMessageCell extends BaseCell implements SeekBar.SeekBarDelegate
        if (drawName && isGroupChat && !currentMessageObject.isOutOwner()) {
            if (newUser != null) {
                newNameString = "ErrName"; // use MrContact.getName(), if really needed
-            } else if (newChat != null) {
-                newNameString = newChat.title;
            }
        }

@@ -909,10 +900,6 @@ public class ChatMessageCell extends BaseCell implements SeekBar.SeekBarDelegate
            return true;
        }

-        if (drawForwardedName) {
-            newNameString = currentMessageObject.getForwardedName();
-            return currentForwardNameString == null && newNameString != null || currentForwardNameString != null && newNameString == null || currentForwardNameString != null && newNameString != null && !currentForwardNameString.equals(newNameString);
-        }
        return false;
    }

@@ -1046,7 +1033,7 @@ public class ChatMessageCell extends BaseCell implements SeekBar.SeekBarDelegate

            maxWidth = maxWidth - dp(86);

-            MrPoortext pt = MrMailbox.getMsg(messageObject.getId()).getMediainfo();
+            MrLot pt = MrMailbox.getMsg(messageObject.getId()).getMediainfo();
            CharSequence stringFinal = TextUtils.ellipsize(pt.getText2(), audioTitlePaint, maxWidth, TextUtils.TruncateAt.MIDDLE);
            songLayout = new StaticLayout(stringFinal, audioTitlePaint, maxWidth, Layout.Alignment.ALIGN_NORMAL, 1.0f, 0.0f, false);
            if (songLayout.getLineCount() > 0) {
@@ -1083,12 +1070,12 @@ public class ChatMessageCell extends BaseCell implements SeekBar.SeekBarDelegate
            }
            int minutes = duration / 60;
            int seconds = duration - minutes * 60;
-            String str = String.format("%d:%02d, %s", minutes, seconds, formatFileSize(documentAttach.size));
-            if( MrMailbox.getMsg(messageObject.getId()).isIncreation()!=0 ) {
-                str = ApplicationLoader.applicationContext.getString(R.string.OneMoment);
+            String infoString = String.format("%d:%02d, %s", minutes, seconds, formatFileSize(documentAttach.size));
+            if( MrMailbox.getMsg(messageObject.getId()).isIncreation() ) {
+                infoString = ApplicationLoader.applicationContext.getString(R.string.OneMoment);
            }
-            infoWidth = (int) Math.ceil(infoPaint.measureText(str));
-            infoLayout = new StaticLayout(str, infoPaint, infoWidth, Layout.Alignment.ALIGN_NORMAL, 1.0f, 0.0f, false);
+            infoWidth = (int) Math.ceil(infoPaint.measureText(infoString));
+            infoLayout = new StaticLayout(infoString, infoPaint, infoWidth, Layout.Alignment.ALIGN_NORMAL, 1.0f, 0.0f, false);
        }
        else
        {
@@ -1103,30 +1090,24 @@ public class ChatMessageCell extends BaseCell implements SeekBar.SeekBarDelegate
            }
            docTitleLayout = StaticLayoutEx.createStaticLayout(name, docNamePaint, maxWidth, Layout.Alignment.ALIGN_NORMAL, 1.0f, 0.0f, false, TextUtils.TruncateAt.MIDDLE, maxWidth, drawPhotoImage ? 2 : 1);
            docTitleOffsetX = Integer.MIN_VALUE;
-            int width;
            if (docTitleLayout != null && docTitleLayout.getLineCount() > 0) {
                int maxLineWidth = 0;
                for (int a = 0; a < docTitleLayout.getLineCount(); a++) {
                    maxLineWidth = Math.max(maxLineWidth, (int) Math.ceil(docTitleLayout.getLineWidth(a)));
                    docTitleOffsetX = Math.max(docTitleOffsetX, (int) Math.ceil(-docTitleLayout.getLineLeft(a)));
                }
-                width = Math.min(maxWidth, maxLineWidth);
            } else {
-                width = maxWidth;
                docTitleOffsetX = 0;
            }

-            String str = formatFileSize(documentAttach.size) + " " + FileLoader.getDocumentExtension(documentAttach);
-            infoWidth = Math.min(maxWidth - AndroidUtilities.dp(30), (int) Math.ceil(infoPaint.measureText(str)));
-            CharSequence str2 = TextUtils.ellipsize(str, infoPaint, infoWidth, TextUtils.TruncateAt.END);
-            try {
-                if (infoWidth < 0) {
-                    infoWidth = dp(10);
-                }
-                infoLayout = new StaticLayout(str2, infoPaint, infoWidth, Layout.Alignment.ALIGN_NORMAL, 1.0f, 0.0f, false);
-            } catch (Exception e) {
+            String infoString = formatFileSize(documentAttach.size) + " " + FileLoader.getDocumentExtension(documentAttach);
+            infoWidth = Math.min(maxWidth - AndroidUtilities.dp(30), (int) Math.ceil(infoPaint.measureText(infoString)));
+            CharSequence str2 = TextUtils.ellipsize(infoString, infoPaint, infoWidth, TextUtils.TruncateAt.END);

+            if (infoWidth < 0) {
+                infoWidth = dp(10);
            }
+            infoLayout = new StaticLayout(str2, infoPaint, infoWidth, Layout.Alignment.ALIGN_NORMAL, 1.0f, 0.0f, false);

            if (drawPhotoImage) {
                currentPhotoObject = FileLoader.getClosestPhotoSizeWithSize(messageObject.photoThumbs, getPhotoSize());
@@ -1221,7 +1202,6 @@ public class ChatMessageCell extends BaseCell implements SeekBar.SeekBarDelegate
            wasLayout = false;
            drawNewchatButton = checkNeedDrawNewchatButton(messageObject);
            currentUser = null;
-            //currentChat = null;
            drawNameLayout = false;

            resetPressedLink(-1);
@@ -1243,7 +1223,7 @@ public class ChatMessageCell extends BaseCell implements SeekBar.SeekBarDelegate
            drawBackground = true;
            drawName = false;
            useSeekBarWaveform = false;
-            drawForwardedName = false;
+            allowForwardedName = false;
            mediaBackground = false;
            availableTimeWidth = 0;
            photoImage.setNeedsQualityThumb(false);
@@ -1258,25 +1238,15 @@ public class ChatMessageCell extends BaseCell implements SeekBar.SeekBarDelegate
            }

            if (messageObject.type == MessageObject.MO_TYPE0_TEXT) {
-                drawForwardedName = true;
+                allowForwardedName = true;

                int maxWidth;
-                if (isTablet()) {
-                    if (isGroupChat && !messageObject.isOutOwner() && messageObject.isFromUser()) {
-                        maxWidth = getMinTabletSide() - dp(122);
-                        drawName = true;
-                    } else {
-                        drawName = false;
-                        maxWidth = getMinTabletSide() - dp(80);
-                    }
+                if (isGroupChat && !messageObject.isOutOwner() && messageObject.isFromUser()) {
+                    maxWidth = Math.min(displaySize.x, displaySize.y) - dp(122);
+                    drawName = true;
                } else {
-                    if (isGroupChat && !messageObject.isOutOwner() && messageObject.isFromUser()) {
-                        maxWidth = Math.min(displaySize.x, displaySize.y) - dp(122);
-                        drawName = true;
-                    } else {
-                        maxWidth = Math.min(displaySize.x, displaySize.y) - dp(80);
-                        drawName = false;
-                    }
+                    maxWidth = Math.min(displaySize.x, displaySize.y) - dp(80);
+                    drawName = false;
                }
                measureTime(messageObject);
                int timeMore = timeWidth + dp(6);
@@ -1309,12 +1279,8 @@ public class ChatMessageCell extends BaseCell implements SeekBar.SeekBarDelegate
                photoImage.setImageBitmap((Drawable) null);
                calcBackgroundWidth(maxWidth, timeMore, maxChildWidth);
            } else if (messageObject.type == MessageObject.MO_TYPE2_VOICE) {
-                drawForwardedName = true;
-                if (isTablet()) {
-                    backgroundWidth = Math.min(getMinTabletSide() - dp(isGroupChat && messageObject.isFromUser() && !messageObject.isOutOwner() ? 102 : 50), dp(270));
-                } else {
-                    backgroundWidth = Math.min(displaySize.x - dp(isGroupChat && messageObject.isFromUser() && !messageObject.isOutOwner() ? 102 : 50), dp(270));
-                }
+                allowForwardedName = true;
+                backgroundWidth = Math.min(displaySize.x - dp(isGroupChat && messageObject.isFromUser() && !messageObject.isOutOwner() ? 102 : 50), dp(270));
                createDocumentLayout(backgroundWidth, messageObject);

                setMessageObjectInternal(messageObject);
@@ -1323,11 +1289,7 @@ public class ChatMessageCell extends BaseCell implements SeekBar.SeekBarDelegate

                updateWaveform(true);
            } else if (messageObject.type == MessageObject.MO_TYPE14_MUSIC) {
-                if (isTablet()) {
-                    backgroundWidth = Math.min(getMinTabletSide() - dp(isGroupChat && messageObject.isFromUser() && !messageObject.isOutOwner() ? 102 : 50), dp(270));
-                } else {
-                    backgroundWidth = Math.min(displaySize.x - dp(isGroupChat && messageObject.isFromUser() && !messageObject.isOutOwner() ? 102 : 50), dp(270));
-                }
+                backgroundWidth = Math.min(displaySize.x - dp(isGroupChat && messageObject.isFromUser() && !messageObject.isOutOwner() ? 102 : 50), dp(270));

                createDocumentLayout(backgroundWidth, messageObject);

@@ -1335,7 +1297,7 @@ public class ChatMessageCell extends BaseCell implements SeekBar.SeekBarDelegate

                totalHeight = dp(80) + namesOffset;
            } else {
-                drawForwardedName = messageObject.messageOwner.fwd_from != null && messageObject.type != MessageObject.MO_TYPE13_STICKER;
+                allowForwardedName = messageObject.isForwarded() && messageObject.type != MessageObject.MO_TYPE13_STICKER;
                mediaBackground = messageObject.type != MessageObject.MO_TYPE9_FILE;
                drawImageButton = false; // we do not want the image button for images
                drawPhotoImage = true;
@@ -1352,11 +1314,7 @@ public class ChatMessageCell extends BaseCell implements SeekBar.SeekBarDelegate

                photoImage.setForcePreview(false);
                if (messageObject.type == MessageObject.MO_TYPE9_FILE) {
-                    if (isTablet()) {
-                        backgroundWidth = Math.min(getMinTabletSide() - dp(isGroupChat && messageObject.isFromUser() && !messageObject.isOutOwner() ? 102 : 50), dp(270));
-                    } else {
-                        backgroundWidth = Math.min(displaySize.x - dp(isGroupChat && messageObject.isFromUser() && !messageObject.isOutOwner() ? 102 : 50), dp(270));
-                    }
+                    backgroundWidth = Math.min(displaySize.x - dp(isGroupChat && messageObject.isFromUser() && !messageObject.isOutOwner() ? 102 : 50), dp(270));
                    if (checkNeedDrawNewchatButton(messageObject)) {
                        backgroundWidth -= dp(20);
                    }
@@ -1395,11 +1353,7 @@ public class ChatMessageCell extends BaseCell implements SeekBar.SeekBarDelegate
                    }
                    float maxHeight;
                    float maxWidth;
-                    if (isTablet()) {
-                        maxHeight = maxWidth = getMinTabletSide() * 0.4f;
-                    } else {
-                        maxHeight = maxWidth = Math.min(displaySize.x, displaySize.y) * 0.5f;
-                    }
+                    maxHeight = maxWidth = Math.min(displaySize.x, displaySize.y) * 0.5f;
                    if (photoWidth == 0) {
                        photoHeight = (int) maxHeight;
                        photoWidth = photoHeight + dp(100);
@@ -1431,11 +1385,7 @@ public class ChatMessageCell extends BaseCell implements SeekBar.SeekBarDelegate
                    }
                } else {
                    int maxPhotoWidth;
-                    if (isTablet()) {
-                        maxPhotoWidth = photoWidth = (int) (getMinTabletSide() * 0.7f);
-                    } else {
-                        maxPhotoWidth = photoWidth = (int) (Math.min(displaySize.x, displaySize.y) * 0.7f);
-                    }
+                    maxPhotoWidth = photoWidth = (int) (Math.min(displaySize.x, displaySize.y) * 0.7f);
                    photoHeight = photoWidth + dp(100);
                    if (checkNeedDrawNewchatButton(messageObject)) {
                        maxPhotoWidth -= dp(20);
@@ -1604,7 +1554,7 @@ public class ChatMessageCell extends BaseCell implements SeekBar.SeekBarDelegate
                }
                setMessageObjectInternal(messageObject);

-                if (drawForwardedName) {
+                if (allowForwardedName) {
                    namesOffset += dp(5);
                } else if (drawNameLayout && messageObject.messageOwner.reply_to_msg_id == 0) {
                    namesOffset += dp(7);
@@ -1655,10 +1605,7 @@ public class ChatMessageCell extends BaseCell implements SeekBar.SeekBarDelegate
        if (changed || !wasLayout) {
            layoutWidth = getMeasuredWidth();
            layoutHeight = getMeasuredHeight() - substractBackgroundHeight;
-            if (timeTextWidth < 0) {
-                timeTextWidth = dp(10);
-            }
-            timeLayout = new StaticLayout(currentTimeString, timePaint, timeTextWidth + dp(6), Layout.Alignment.ALIGN_NORMAL, 1.0f, 0.0f, false);
+            timeLayout = new StaticLayout(currentTimeString, timePaint, timeWidth + dp(6), Layout.Alignment.ALIGN_NORMAL, 1.0f, 0.0f, false);
            if (!mediaBackground) {
                if (!currentMessageObject.isOutOwner()) {
                    timeX = backgroundWidth - dp(9) - timeWidth + (isGroupChat && currentMessageObject.isFromUser() ? dp(48) : 0);
@@ -1882,7 +1829,7 @@ public class ChatMessageCell extends BaseCell implements SeekBar.SeekBarDelegate
        }
        else if (currentMessageObject.type == MessageObject.MO_TYPE1_PHOTO || documentAttachType == DOCUMENT_ATTACH_TYPE_VIDEO) {
            if (photoImage.getVisible()) {
-                if (infoLayout != null && (buttonState == BS1_CLICK_TO_PAUSE || buttonState == BS0_CLICK_TO_PLAY || buttonState == BS3_NORMAL)) {
+                if (infoLayout != null /*&& (buttonState == BS1_CLICK_TO_PAUSE || buttonState == BS0_CLICK_TO_PLAY || buttonState == BS3_NORMAL)*/) {
                    infoPaint.setColor(Theme.MSG_MEDIA_INFO_TEXT_COLOR);
                    setDrawableBounds(Theme.timeBackgroundDrawable, photoImage.getImageX() + dp(4), photoImage.getImageY() + dp(4), infoWidth + dp(8), dp(16.5f));
                    Theme.timeBackgroundDrawable.draw(canvas);
@@ -1978,18 +1925,10 @@ public class ChatMessageCell extends BaseCell implements SeekBar.SeekBarDelegate
    private int getMaxNameWidth() {
        if (documentAttachType == DOCUMENT_ATTACH_TYPE_STICKER) {
            int maxWidth;
-            if (isTablet()) {
-                if (isGroupChat && !currentMessageObject.isOutOwner() && currentMessageObject.isFromUser()) {
-                    maxWidth = getMinTabletSide() - dp(42);
-                } else {
-                    maxWidth = getMinTabletSide();
-                }
+            if (isGroupChat && !currentMessageObject.isOutOwner() && currentMessageObject.isFromUser()) {
+                maxWidth = Math.min(displaySize.x, displaySize.y) - dp(42);
            } else {
-                if (isGroupChat && !currentMessageObject.isOutOwner() && currentMessageObject.isFromUser()) {
-                    maxWidth = Math.min(displaySize.x, displaySize.y) - dp(42);
-                } else {
-                    maxWidth = Math.min(displaySize.x, displaySize.y);
-                }
+                maxWidth = Math.min(displaySize.x, displaySize.y);
            }
            return maxWidth - backgroundWidth - dp(57);
        }
@@ -2088,8 +2027,13 @@ public class ChatMessageCell extends BaseCell implements SeekBar.SeekBarDelegate
    }

    private void measureTime(MessageObject messageObject) {
-        currentTimeString = LocaleController.getInstance().formatterDay.format((long) (messageObject.messageOwner.date) * 1000);
-        timeTextWidth = timeWidth = (int) Math.ceil(timePaint.measureText(currentTimeString));
+        currentTimeString = LocaleController.getInstance().getFormatterDay().format((long) (messageObject.messageOwner.date) * 1000);
+        timeWidth = (int) Math.ceil(timePaint.measureText(currentTimeString));
+        timeEncrWidth = 0;
+        if( messageObject.messageOwner.show_padlock) {
+            timeEncrWidth = Theme.encrOutDrawable.getIntrinsicWidth();
+            timeWidth += timeEncrWidth;
+        }
    }

    private boolean isDrawSelectedBackground() {
@@ -2107,11 +2051,7 @@ public class ChatMessageCell extends BaseCell implements SeekBar.SeekBarDelegate

        if (currentMessageObject.isFromUser()) {
            currentUser = MrMailbox.getUser(currentMessageObject.messageOwner.from_id);
-        } /*else if (currentMessageObject.messageOwner.from_id < 0) {
-            currentChat = MessagesController.getInstance().getChat(-currentMessageObject.messageOwner.from_id);
-        } else if (currentMessageObject.messageOwner.post) {
-            currentChat = MessagesController.getInstance().getChat(currentMessageObject.messageOwner.to_id.channel_id);
-        }*/
+        }

        MrContact mrContact = null;
        String cname = "";
@@ -2137,21 +2077,15 @@ public class ChatMessageCell extends BaseCell implements SeekBar.SeekBarDelegate
                nameWidth = dp(100);
            }

-            if (authorName) {
-                if (currentUser != null) {
-                    currentNameString = cname;
-                } /*else if (currentChat != null) {
-                    currentNameString = currentChat.title;
-                } */ else {
-                    currentNameString = "DELETED";
-                }
+            if (currentUser != null) {
+                currentNameString = cname;
            } else {
-                currentNameString = "";
+                currentNameString = "DELETED";
            }
            CharSequence nameStringFinal = TextUtils.ellipsize(currentNameString.replace('\n', ' '), namePaint, nameWidth, TextUtils.TruncateAt.END);
            try {
                nameLayout = new StaticLayout(nameStringFinal, namePaint, nameWidth + dp(2), Layout.Alignment.ALIGN_NORMAL, 1.0f, 0.0f, false);
-                if (nameLayout != null && nameLayout.getLineCount() > 0) {
+                if (nameLayout.getLineCount() > 0) {
                    nameWidth = (int) Math.ceil(nameLayout.getLineWidth(0));
                    if (messageObject.type != MessageObject.MO_TYPE13_STICKER) {
                        namesOffset += dp(19);
@@ -2172,28 +2106,18 @@ public class ChatMessageCell extends BaseCell implements SeekBar.SeekBarDelegate
            nameWidth = 0;
        }

-        currentForwardNameString = null;
-        forwardedNameLayout[0] = null;
-        forwardedNameLayout[1] = null;
+        forwardedNameLayout = null;
        forwardedNameWidth = 0;
-        if( drawForwardedName && messageObject.isForwarded() && messageObject.messageOwner.fwd_from!=null )
+        if( allowForwardedName && messageObject.isForwarded() )
        {
-            currentForwardNameString = messageObject.messageOwner.fwd_from.m_name;
-
            forwardedNameWidth = getMaxNameWidth();
-            int fromWidth = (int) Math.ceil(forwardNamePaint.measureText(ApplicationLoader.applicationContext.getString(R.string.From) + " "));
-            CharSequence name = TextUtils.ellipsize(currentForwardNameString.replace('\n', ' '), forward2NamePaint, forwardedNameWidth - fromWidth, TextUtils.TruncateAt.END);
            CharSequence lastLine;
-            lastLine = replaceTags(String.format("%s <b>%s</b>", ApplicationLoader.applicationContext.getString(R.string.From), name));
-            lastLine = TextUtils.ellipsize(lastLine, forwardNamePaint, forwardedNameWidth, TextUtils.TruncateAt.END);
            try {
-                forwardedNameLayout[1] = new StaticLayout(lastLine, forwardNamePaint, forwardedNameWidth + dp(2), Layout.Alignment.ALIGN_NORMAL, 1.0f, 0.0f, false);
-                lastLine = TextUtils.ellipsize(replaceTags(ApplicationLoader.applicationContext.getString(R.string.ForwardedMessage)), forwardNamePaint, forwardedNameWidth, TextUtils.TruncateAt.END);
-                forwardedNameLayout[0] = new StaticLayout(lastLine, forwardNamePaint, forwardedNameWidth + dp(2), Layout.Alignment.ALIGN_NORMAL, 1.0f, 0.0f, false);
-                forwardedNameWidth = Math.max((int) Math.ceil(forwardedNameLayout[0].getLineWidth(0)), (int) Math.ceil(forwardedNameLayout[1].getLineWidth(0)));
-                forwardNameOffsetX[0] = forwardedNameLayout[0].getLineLeft(0);
-                forwardNameOffsetX[1] = forwardedNameLayout[1].getLineLeft(0);
-                namesOffset += dp(36);
+                lastLine = TextUtils.ellipsize(replaceTags(ApplicationLoader.applicationContext.getString(R.string.ForwardedMessage)), forwardedNamePaint, forwardedNameWidth, TextUtils.TruncateAt.END);
+                forwardedNameLayout = new StaticLayout(lastLine, forwardedNamePaint, forwardedNameWidth + dp(2), Layout.Alignment.ALIGN_NORMAL, 1.0f, 0.0f, false);
+                forwardedNameWidth = (int) Math.ceil(forwardedNameLayout.getLineWidth(0));
+                forwardedNameOffsetX = forwardedNameLayout.getLineLeft(0);
+                namesOffset += dp(18);
            } catch (Exception e) {

            }
@@ -2299,24 +2223,23 @@ public class ChatMessageCell extends BaseCell implements SeekBar.SeekBarDelegate
            canvas.restore();
        }

-        if (drawForwardedName && forwardedNameLayout[0] != null && forwardedNameLayout[1] != null) {
-            forwardNameY = dp(10 + (drawNameLayout ? 19 : 0));
-            forwardNamePaint.setColor(Theme.MSG_IN_TIME_N_FWD_TEXT_COLOR);
+        if (allowForwardedName && forwardedNameLayout != null ) {
+            int forwardedNameX = 0;
+            int forwardedNameY = dp(10 + (drawNameLayout ? 19 : 0));
+            forwardedNamePaint.setColor(Theme.MSG_IN_TIME_N_FWD_TEXT_COLOR);
            if (currentMessageObject.isOutOwner()) {
-                forwardNameX = currentBackgroundDrawable.getBounds().left + dp(11);
+                forwardedNameX = currentBackgroundDrawable.getBounds().left + dp(11);
            } else {
                if (mediaBackground) {
-                    forwardNameX = currentBackgroundDrawable.getBounds().left + dp(11);
+                    forwardedNameX = currentBackgroundDrawable.getBounds().left + dp(11);
                } else {
-                    forwardNameX = currentBackgroundDrawable.getBounds().left + dp(17);
+                    forwardedNameX = currentBackgroundDrawable.getBounds().left + dp(17);
                }
            }
-            for (int a = 0; a < 2; a++) {
-                canvas.save();
-                canvas.translate(forwardNameX - forwardNameOffsetX[a], forwardNameY + dp(16) * a);
-                forwardedNameLayout[a].draw(canvas);
-                canvas.restore();
-            }
+            canvas.save();
+            canvas.translate(forwardedNameX - forwardedNameOffsetX, forwardedNameY);
+            forwardedNameLayout.draw(canvas);
+            canvas.restore();
        }

        if (drawTime || !mediaBackground) {
@@ -2333,19 +2256,36 @@ public class ChatMessageCell extends BaseCell implements SeekBar.SeekBarDelegate
                int additionalX = 0;

                canvas.save();
-                canvas.translate(timeX + additionalX, layoutHeight - dp(11.3f) - timeLayout.getHeight());
+                canvas.translate(timeX + additionalX + timeEncrWidth, layoutHeight - dp(11.3f) - timeLayout.getHeight());
                timeLayout.draw(canvas);
                canvas.restore();
            } else {
                int additionalX = 0;

                canvas.save();
-                canvas.translate(timeX + additionalX, layoutHeight - dp(6.5f) - timeLayout.getHeight());
+                canvas.translate(timeX + additionalX + timeEncrWidth, layoutHeight - dp(6.5f) - timeLayout.getHeight());
                timeLayout.draw(canvas);
                canvas.restore();
                //canvas.drawRect(timeX, layoutHeight - AndroidUtilities.dp(6.5f) - timeLayout.getHeight(), timeX + availableTimeWidth, layoutHeight - AndroidUtilities.dp(4.5f) - timeLayout.getHeight(), timePaint);
            }

+            // draw encryption icon left of clock
+            if( timeEncrWidth>0 ) {
+                if (!mediaBackground) {
+                    if (currentMessageObject.isOutOwner()) {
+                        setDrawableBounds(Theme.encrOutDrawable, timeX, layoutHeight - dp(8.5f) - Theme.encrOutDrawable.getIntrinsicHeight());
+                        Theme.encrOutDrawable.draw(canvas);
+                    } else {
+                        setDrawableBounds(Theme.encrInDrawable, timeX, layoutHeight - dp(8.5f) - Theme.encrInDrawable.getIntrinsicHeight());
+                        Theme.encrInDrawable.draw(canvas);
+                    }
+                } else {
+                    setDrawableBounds(Theme.encrMediaDrawable, timeX, layoutHeight - dp(13.2f) - Theme.encrMediaDrawable.getIntrinsicHeight());
+                    Theme.encrMediaDrawable.draw(canvas);
+                }
+            }
+
+            // draw checkmarks right of clock
            if (currentMessageObject.isOutOwner()) {
                boolean drawCheck1 = false;
                boolean drawCheck2 = false;
@@ -1,6 +1,6 @@
 /*******************************************************************************
 *
- *                          Messenger Android Frontend
+ *                              Delta Chat Android
 *                        (C) 2013-2016 Nikolai Kudashov
 *                           (C) 2017 Björn Petersen
 *                    Contact: r10s@b44t.com, http://b44t.com
@@ -21,21 +21,20 @@
 ******************************************************************************/


-package com.b44t.ui.Cells;
+package com.b44t.messenger.Cells;

 import android.content.Context;
 import android.graphics.Typeface;
 import android.util.TypedValue;
 import android.view.Gravity;
 import android.widget.FrameLayout;
-import android.widget.ImageView;
 import android.widget.TextView;

 import com.b44t.messenger.AndroidUtilities;
 import com.b44t.messenger.ApplicationLoader;
 import com.b44t.messenger.R;
-import com.b44t.ui.Components.LayoutHelper;
-import com.b44t.ui.ActionBar.Theme;
+import com.b44t.messenger.Components.LayoutHelper;
+import com.b44t.messenger.ActionBar.Theme;

 public class ChatUnreadCell extends FrameLayout {

@@ -1,6 +1,6 @@
 /*******************************************************************************
 *
- *                          Messenger Android Frontend
+ *                              Delta Chat Android
 *                        (C) 2013-2016 Nikolai Kudashov
 *                           (C) 2017 Björn Petersen
 *                    Contact: r10s@b44t.com, http://b44t.com
@@ -21,7 +21,7 @@
 ******************************************************************************/


-package com.b44t.ui.Cells;
+package com.b44t.messenger.Cells;

 import android.content.Context;
 import android.graphics.Canvas;
@@ -39,26 +39,24 @@ import android.text.style.ForegroundColorSpan;
 import android.view.MotionEvent;

 import com.b44t.messenger.AndroidUtilities;
+import com.b44t.messenger.ApplicationLoader;
 import com.b44t.messenger.ContactsController;
+import com.b44t.messenger.EmojiInputView;
 import com.b44t.messenger.LocaleController;
-import com.b44t.messenger.MessageObject;
 import com.b44t.messenger.MrChat;
+import com.b44t.messenger.MrLot;
 import com.b44t.messenger.MrMailbox;
 import com.b44t.messenger.MrMsg;
-import com.b44t.messenger.MrPoortext;
-import com.b44t.messenger.TLRPC;
-import com.b44t.messenger.Emoji;
 import com.b44t.messenger.R;
 import com.b44t.messenger.ImageReceiver;
-import com.b44t.ui.ActionBar.Theme;
-import com.b44t.ui.Components.AvatarDrawable;
+import com.b44t.messenger.ActionBar.Theme;
+import com.b44t.messenger.Components.AvatarDrawable;


-public class DialogCell extends BaseCell {
+public class ChatlistCell extends BaseCell {

    private static TextPaint namePaint;
    private static TextPaint messagePaint;
-    private static TextPaint messagePrintingPaint;
    private static TextPaint timePaint;
    private static TextPaint countPaint;

@@ -67,33 +65,23 @@ public class DialogCell extends BaseCell {
    private static Drawable clockDrawable;
    private static Drawable errorDrawable;
    private static Drawable countDrawable;
-    private static Drawable countDrawableGrey;
    private static Drawable groupDrawable;
    private static Drawable muteDrawable;
-    private static Drawable verifiedDrawable;
+    private static Drawable closeDrawable;

    private static Paint linePaint;
-    private static Paint backPaint;

-    private long currentDialogId;
-    private final boolean isDialogCell = true; // if it is no dialog cell, it is a search cell ...
+    private long currentChatId;
    private int unreadCount;
-    private int lastSendState;
-    private boolean dialogMuted;
-    private final MessageObject message = null;
-    private int index;
+    private boolean chatMuted;

    private ImageReceiver avatarImage;
-    private AvatarDrawable avatarDrawable;
-
-    private final Object user = null;
-    private final Object chat = null;

    public boolean useSeparator = false;

    private int nameLeft;
    private StaticLayout nameLayout;
-    private boolean drawNameGroup;
+    private boolean drawGroupIcon;
    private int nameMuteLeft;
    private int nameLockLeft;
    private int nameLockTop;
@@ -114,7 +102,7 @@ public class DialogCell extends BaseCell {
    private StaticLayout messageLayout;

    private boolean drawError;
-    private int errorTop = AndroidUtilities.dp(39);
+    private int errorTop = AndroidUtilities.dp(42);
    private int errorLeft;

    private boolean drawCount;
@@ -123,39 +111,35 @@ public class DialogCell extends BaseCell {
    private int countWidth;
    private StaticLayout countLayout;

-    private boolean drawVerified;
+    private boolean drawFlag; // draw a flag as eg. "Archived" below the time
+    private int flagLeft;
+    private int flagWidth;
+    private StaticLayout flagLayout;

+    private int avatarLeft;
    private int avatarTop = AndroidUtilities.dp(10);
-
-    private boolean isSelected;
+    private int avatarWH = AndroidUtilities.dp(52);

    private MrChat m_mrChat = new MrChat(0);
-    private MrPoortext m_summary = new MrPoortext(0);
+    private MrLot m_summary = new MrLot(0);
    private boolean m_showUnreadCount;

-    public DialogCell(Context context) {
+    public ChatlistCell(Context context) {
        super(context);

        if (namePaint == null) {
            namePaint = new TextPaint(TextPaint.ANTI_ALIAS_FLAG);
            namePaint.setTextSize(AndroidUtilities.dp(17));
-            namePaint.setColor(Theme.DIALOGS_TITLE_TEXT_COLOR);
+            namePaint.setColor(Theme.CHATLIST_TITLE_TEXT_COLOR);

            messagePaint = new TextPaint(TextPaint.ANTI_ALIAS_FLAG);
            messagePaint.setTextSize(AndroidUtilities.dp(16));
-            messagePaint.setColor(Theme.DIALOGS_MESSAGE_TEXT_COLOR);
-            messagePaint.linkColor = Theme.DIALOGS_MESSAGE_TEXT_COLOR;
+            messagePaint.setColor(Theme.CHATLIST_MESSAGE_TEXT_COLOR);
+            messagePaint.linkColor = Theme.CHATLIST_MESSAGE_TEXT_COLOR;

            linePaint = new Paint();
            linePaint.setColor(0xffdcdcdc);

-            backPaint = new Paint();
-            backPaint.setColor(0x0f000000);
-
-            messagePrintingPaint = new TextPaint(TextPaint.ANTI_ALIAS_FLAG);
-            messagePrintingPaint.setTextSize(AndroidUtilities.dp(16));
-            messagePrintingPaint.setColor(Theme.DIALOGS_PRINTING_TEXT_COLOR);
-
            timePaint = new TextPaint(TextPaint.ANTI_ALIAS_FLAG);
            timePaint.setTextSize(AndroidUtilities.dp(13));
            timePaint.setColor(0xff999999);
@@ -168,37 +152,34 @@ public class DialogCell extends BaseCell {
            checkDrawable = getResources().getDrawable(R.drawable.dialogs_check);
            halfCheckDrawable = getResources().getDrawable(R.drawable.dialogs_halfcheck);
            clockDrawable = getResources().getDrawable(R.drawable.msg_clock);
-            errorDrawable = getResources().getDrawable(R.drawable.dialogs_warning);
+            errorDrawable = getResources().getDrawable(R.drawable.msg_warning);
            countDrawable = getResources().getDrawable(R.drawable.dialogs_badge);
-            countDrawableGrey = getResources().getDrawable(R.drawable.dialogs_badge2);
            groupDrawable = getResources().getDrawable(R.drawable.list_group);
            muteDrawable = getResources().getDrawable(R.drawable.mute_grey);
-            verifiedDrawable = getResources().getDrawable(R.drawable.check_list);
+            closeDrawable = getResources().getDrawable(R.drawable.ic_dismiss_deaddrop);
        }

-        setBackgroundResource(R.drawable.list_selector);
-
        avatarImage = new ImageReceiver(this);
        avatarImage.setRoundRadius(AndroidUtilities.dp(26));
-        avatarDrawable = new AvatarDrawable();
    }

-    public void setDialog(MrChat mrChat, MrPoortext mrSummary, int i, boolean showUnreadCount) { // called for the chats overview
-
+    public void setChat(MrChat mrChat, MrLot mrSummary, int i, boolean showUnreadCount) {
        m_mrChat  = mrChat;
        m_summary = mrSummary;
        m_showUnreadCount = showUnreadCount;

-        currentDialogId = mrChat.getId();
-        index = i;
+        currentChatId = mrChat.getId();
+
+        if(currentChatId==MrChat.MR_CHAT_ID_DEADDROP) {
+            setBackgroundColor(Theme.CHATLIST_DEADDROP_BACKGROUND_COLOR);
+        }
+        else {
+            setBackgroundResource(R.drawable.list_selector);
+        }

        update(0);
    }

-    public long getDialogId() {
-        return currentDialogId;
-    }
-
    @Override
    protected void onDetachedFromWindow() {
        super.onDetachedFromWindow();
@@ -218,7 +199,7 @@ public class DialogCell extends BaseCell {

    @Override
    protected void onLayout(boolean changed, int left, int top, int right, int bottom) {
-        if (currentDialogId == 0) {
+        if (currentChatId == 0) {
            super.onLayout(changed, left, top, right, bottom);
            return;
        }
@@ -227,6 +208,7 @@ public class DialogCell extends BaseCell {
        }
    }

+    static public boolean deaddropClosePressed;
    @Override
    public boolean onTouchEvent(MotionEvent event) {
        if (Build.VERSION.SDK_INT >= 21 && getBackground() != null) {
@@ -234,108 +216,86 @@ public class DialogCell extends BaseCell {
                getBackground().setHotspot(event.getX(), event.getY());
            }
        }
+
+        if( currentChatId==MrChat.MR_CHAT_ID_DEADDROP ) {
+            if (event.getAction() == MotionEvent.ACTION_DOWN) {
+                float x = event.getX();
+                deaddropClosePressed = (x < avatarLeft + avatarWH);
+            }
+        }
+
        return super.onTouchEvent(event);
    }

    public void buildLayout() {
        String nameString = "";
        String timeString = "";
-        String countString = null;
        CharSequence messageString = "";
-        //CharSequence printingString = null;
-        /* EDIT BY MR -- we currently do not support stuff as "ist just typing", "uploads an images" etc.
-        if (isDialogCell) {
-            printingString = MessagesController.getInstance().printingStrings.get(currentDialogId);
-        }
-        */
        TextPaint currentNamePaint = namePaint;
        TextPaint currentMessagePaint = messagePaint;
-        boolean checkMessage = true;

-        drawNameGroup = false;
-        //drawNameBroadcast = false;
-        //drawNameLock = false;
-        //drawNameBot = false;
-        drawVerified = false;
+        drawGroupIcon = false;

-        {
-            if (m_mrChat.getType()==MrChat.MR_CHAT_GROUP) { // EDIT BY MR
-                //if (chat.id < 0 || ChatObject.isChannel(chat) && !chat.megagroup) {
-                //    drawNameBroadcast = true;
-                //    nameLockTop = AndroidUtilities.dp(16.5f);
-                //} else {
-                    drawNameGroup = true;
-                    nameLockTop = AndroidUtilities.dp(17.5f);
-                //}
-                //drawVerified = chat.verified; -- /EDIT BY MR
+        if (m_mrChat.getType()==MrChat.MR_CHAT_GROUP && currentChatId!=MrChat.MR_CHAT_ID_DEADDROP) {
+            drawGroupIcon = true;
+            nameLockTop = AndroidUtilities.dp(17.5f);

-                if (!LocaleController.isRTL) {
-                    nameLockLeft = AndroidUtilities.dp(AndroidUtilities.leftBaseline);
-                    nameLeft = AndroidUtilities.dp(AndroidUtilities.leftBaseline + 4) + (groupDrawable.getIntrinsicWidth());
-                } else {
-                    nameLockLeft = getMeasuredWidth() - AndroidUtilities.dp(AndroidUtilities.leftBaseline) - (groupDrawable.getIntrinsicWidth());
-                    nameLeft = AndroidUtilities.dp(14);
-                }
+            if (!LocaleController.isRTL) {
+                nameLockLeft = AndroidUtilities.dp(AndroidUtilities.leftBaseline);
+                nameLeft = AndroidUtilities.dp(AndroidUtilities.leftBaseline + 4) + (groupDrawable.getIntrinsicWidth());
            } else {
-                if (!LocaleController.isRTL) {
-                    nameLeft = AndroidUtilities.dp(AndroidUtilities.leftBaseline);
-                } else {
-                    nameLeft = AndroidUtilities.dp(14);
-                }
+                nameLockLeft = getMeasuredWidth() - AndroidUtilities.dp(AndroidUtilities.leftBaseline) - (groupDrawable.getIntrinsicWidth());
+                nameLeft = AndroidUtilities.dp(14);
+            }
+        } else {
+            if (!LocaleController.isRTL) {
+                nameLeft = AndroidUtilities.dp(AndroidUtilities.leftBaseline);
+            } else {
+                nameLeft = AndroidUtilities.dp(14);
            }
        }

+        String mess = m_summary.getText2();
+        if (mess.length() > 150) {
+            mess = mess.substring(0, 150);
+        }
+        String title = m_summary.getText1();
+        if( !title.isEmpty() )
        {
-                checkMessage = false;
-                String mess = m_summary.getText2();
-                if (mess.length() > 150) {
-                    mess = mess.substring(0, 150);
-                }
-                String title = m_summary.getText1();
-                if( !title.isEmpty() )
-                {
-                    int title_meaning = m_summary.getText1Meaning();
-                    int title_color = Theme.DIALOGS_NAME_TEXT_COLOR;
-                    switch( title_meaning ) {
-                        case MrPoortext.MR_TEXT1_SELF:  title_color = Theme.DIALOGS_SELF_TEXT_COLOR; break;
-                        case MrPoortext.MR_TEXT1_DRAFT: title_color = Theme.DIALOGS_DRAFT_TEXT_COLOR; break;
-                    }
-                    SpannableStringBuilder stringBuilder = SpannableStringBuilder.valueOf(String.format("%s: %s", title, mess));
-                    stringBuilder.setSpan(new ForegroundColorSpan(title_color), 0, title.length() + 1, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
-                    messageString = Emoji.replaceEmoji(stringBuilder, messagePaint.getFontMetricsInt(), AndroidUtilities.dp(20), false);
-                }
-                else
-                {
-                    messageString = mess;
-                }
-
-                long timestmp =m_summary.getTimestamp();
-                if( timestmp!=0 ) {
-                    timeString = LocaleController.stringForMessageListDate(timestmp);
-                }
-                else {
-                    timeString = "";
-                }
-
-                drawCheck1 = false;
-                drawCheck2 = false;
-                drawClock = false;
-                drawCount = false;
-                drawError = false;
-                switch( m_summary.getState() ) {
-                    case MrMsg.MR_OUT_ERROR: drawError = true; break;
-                    case MrMsg.MR_OUT_PENDING: drawClock = true; break;
-                    case MrMsg.MR_OUT_DELIVERED: drawCheck2 = true; break;
-                    case MrMsg.MR_OUT_READ: drawCheck1 = true; drawCheck2 = true; break;
-                }
-                drawVerified = m_mrChat.isEncrypted()!=0; // we use the "verified" check as an icon for "encryted" and "verified"
+            int title_meaning = m_summary.getText1Meaning();
+            int title_color = Theme.CHATLIST_NAME_TEXT_COLOR;
+            switch( title_meaning ) {
+                case MrLot.MR_TEXT1_SELF:  title_color = Theme.CHATLIST_SELF_TEXT_COLOR; break;
+                case MrLot.MR_TEXT1_DRAFT: title_color = Theme.CHATLIST_DRAFT_TEXT_COLOR; break;
+            }
+            SpannableStringBuilder stringBuilder = SpannableStringBuilder.valueOf(String.format("%s: %s", title, mess));
+            stringBuilder.setSpan(new ForegroundColorSpan(title_color), 0, title.length() + 1, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
+            messageString = EmojiInputView.replaceEmoji(stringBuilder, false);
+        }
+        else
+        {
+            messageString = mess;
        }

-        if (unreadCount != 0) {
-            drawCount = true;
-            countString = String.format("%d", unreadCount);
-        } else {
-            drawCount = false;
+        long timestmp =m_summary.getTimestamp();
+        if( timestmp!=0 ) {
+            timeString = LocaleController.dateForChatlist(timestmp);
+        }
+        else {
+            timeString = "";
+        }
+
+        drawCheck1 = false;
+        drawCheck2 = false;
+        drawClock = false;
+        drawCount = false;
+        drawFlag = false;
+        drawError = false;
+        switch( m_summary.getState() ) {
+            case MrMsg.MR_OUT_ERROR: drawError = true; break;
+            case MrMsg.MR_OUT_PENDING: drawClock = true; break;
+            case MrMsg.MR_OUT_DELIVERED: drawCheck2 = true; break;
+            case MrMsg.MR_OUT_MDN_RCVD: drawCheck1 = true; drawCheck2 = true; break;
        }

        int timeWidth = (int) Math.ceil(timePaint.measureText(timeString));
@@ -357,7 +317,7 @@ public class DialogCell extends BaseCell {
            nameLeft += timeWidth;
        }

-        if (drawNameGroup) {
+        if (drawGroupIcon) {
            nameWidth -= AndroidUtilities.dp(4) + groupDrawable.getIntrinsicWidth();
        }

@@ -393,20 +353,15 @@ public class DialogCell extends BaseCell {
            }
        }

-        if (dialogMuted && !drawVerified) {
+        if (chatMuted) {
            int w = AndroidUtilities.dp(6) + muteDrawable.getIntrinsicWidth();
            nameWidth -= w;
            if (LocaleController.isRTL) {
                nameLeft += w;
            }
-        } else if (drawVerified) {
-            int w = AndroidUtilities.dp(6) + verifiedDrawable.getIntrinsicWidth();
-            nameWidth -= w;
-            if (LocaleController.isRTL) {
-                nameLeft += w;
-            }
        }

+        // build name
        nameWidth = Math.max(AndroidUtilities.dp(12), nameWidth);
        CharSequence nameStringFinal = TextUtils.ellipsize(nameString.replace('\n', ' '), currentNamePaint, nameWidth - AndroidUtilities.dp(12), TextUtils.TruncateAt.END);
        try {
@@ -415,26 +370,57 @@ public class DialogCell extends BaseCell {

        }

+        // build avatar
        int messageWidth = getMeasuredWidth() - AndroidUtilities.dp(AndroidUtilities.leftBaseline + 16);
-        int avatarLeft;
        if (!LocaleController.isRTL) {
            messageLeft = AndroidUtilities.dp(AndroidUtilities.leftBaseline);
-            avatarLeft = AndroidUtilities.dp(AndroidUtilities.isTablet() ? 13 : 9);
+            avatarLeft = AndroidUtilities.dp(9);
        } else {
            messageLeft = AndroidUtilities.dp(16);
-            avatarLeft = getMeasuredWidth() - AndroidUtilities.dp(AndroidUtilities.isTablet() ? 65 : 61);
+            avatarLeft = getMeasuredWidth() - AndroidUtilities.dp(61);
        }
-        avatarImage.setImageCoords(avatarLeft, avatarTop, AndroidUtilities.dp(52), AndroidUtilities.dp(52));
+
+        if( currentChatId==MrChat.MR_CHAT_ID_DEADDROP ) {
+
+        }
+        else {
+            avatarImage.setImageCoords(avatarLeft, avatarTop, avatarWH, avatarWH);
+        }
+
+        // build counter
        if (drawError) {
            int w = errorDrawable.getIntrinsicWidth() + AndroidUtilities.dp(8);
            messageWidth -= w;
            if (!LocaleController.isRTL) {
-                errorLeft = getMeasuredWidth() - errorDrawable.getIntrinsicWidth() - AndroidUtilities.dp(11);
+                errorLeft = getMeasuredWidth() - errorDrawable.getIntrinsicWidth() - AndroidUtilities.dp(16);
            } else {
-                errorLeft = AndroidUtilities.dp(11);
+                errorLeft = AndroidUtilities.dp(16);
                messageLeft += w;
            }
-        } else if (countString != null) {
+        } else if(m_mrChat.getArchived()!=0 || currentChatId==MrChat.MR_CHAT_ID_ARCHIVED_LINK ) {
+            String str;
+            TextPaint strPaint;
+            if( currentChatId==MrChat.MR_CHAT_ID_ARCHIVED_LINK ) {
+                str = m_mrChat.getName();
+                strPaint = messagePaint;
+            }
+            else {
+                str = ApplicationLoader.applicationContext.getString(R.string.Archived);
+                strPaint = timePaint;
+            }
+
+            flagWidth = Math.max(AndroidUtilities.dp(12), (int)Math.ceil(strPaint.measureText(str)));
+            flagLayout = new StaticLayout(str, strPaint, flagWidth, Layout.Alignment.ALIGN_CENTER, 1.0f, 0.0f, false);
+            int w = flagWidth + AndroidUtilities.dp(15);
+            if (!LocaleController.isRTL) {
+                messageWidth -= w;
+                flagLeft = getMeasuredWidth() - flagWidth - AndroidUtilities.dp(15);
+            } else {
+                flagLeft = AndroidUtilities.dp(15);
+            }
+            drawFlag = true;
+        } else if (unreadCount != 0 && currentChatId!=MrChat.MR_CHAT_ID_DEADDROP) {
+            String countString = String.format("%d", unreadCount);
            countWidth = Math.max(AndroidUtilities.dp(12), (int)Math.ceil(countPaint.measureText(countString)));
            countLayout = new StaticLayout(countString, countPaint, countWidth, Layout.Alignment.ALIGN_CENTER, 1.0f, 0.0f, false);
            int w = countWidth + AndroidUtilities.dp(18);
@@ -446,21 +432,8 @@ public class DialogCell extends BaseCell {
                messageLeft += w;
            }
            drawCount = true;
-        } else {
-            drawCount = false;
        }

-        if (checkMessage) {
-            if (messageString == null) {
-                messageString = "";
-            }
-            String mess = messageString.toString();
-            if (mess.length() > 150) {
-                mess = mess.substring(0, 150);
-            }
-            mess = mess.replace('\n', ' ');
-            messageString = Emoji.replaceEmoji(mess, messagePaint.getFontMetricsInt(), AndroidUtilities.dp(17), false);
-        }
        messageWidth = Math.max(AndroidUtilities.dp(12), messageWidth);
        CharSequence messageStringFinal = TextUtils.ellipsize(messageString, currentMessagePaint, messageWidth - AndroidUtilities.dp(12), TextUtils.TruncateAt.END);
        try {
@@ -475,10 +448,8 @@ public class DialogCell extends BaseCell {
            if (nameLayout != null && nameLayout.getLineCount() > 0) {
                left = nameLayout.getLineLeft(0);
                widthpx = Math.ceil(nameLayout.getLineWidth(0));
-                if (dialogMuted && !drawVerified) {
+                if (chatMuted) {
                    nameMuteLeft = (int) (nameLeft + (nameWidth - widthpx) - AndroidUtilities.dp(6) - muteDrawable.getIntrinsicWidth());
-                } else if (drawVerified) {
-                    nameMuteLeft = (int) (nameLeft + (nameWidth - widthpx) - AndroidUtilities.dp(6) - verifiedDrawable.getIntrinsicWidth());
                }
                if (left == 0) {
                    if (widthpx < nameWidth) {
@@ -504,7 +475,7 @@ public class DialogCell extends BaseCell {
                        nameLeft -= (nameWidth - widthpx);
                    }
                }
-                if (dialogMuted || drawVerified) {
+                if (chatMuted) {
                    nameMuteLeft = (int) (nameLeft + left + AndroidUtilities.dp(6));
                }
            }
@@ -520,60 +491,24 @@ public class DialogCell extends BaseCell {
        }
    }

-    public void setDialogSelected(boolean value) {
-        if (isSelected != value) {
-            invalidate();
-        }
-        isSelected = value;
-    }
-
-    public void checkCurrentDialogIndex() {
-        if (index < MrMailbox.m_currChatlist.getCnt()) { // EDIT BY MR - was: index < getDialogsArray().size()
-            TLRPC.TL_dialog dialog = MrMailbox.m_currChatlist.get_TLRPC_TL_dialog(index); // EDIT BY MR - was: getDialogsArray().get(index);
-            final MessageObject newMessageObject = null;
-            if (currentDialogId != dialog.id ||
-                    message != null && message.getId() != dialog.top_message ||
-                    unreadCount != dialog.unread_count ||
-                    message != newMessageObject ||
-                    message == null && newMessageObject != null ) {
-                currentDialogId = dialog.id;
-                update(0);
-            }
-        }
-    }
-
    public void update(int mask) {
        if( m_showUnreadCount ) {
-            unreadCount = m_mrChat.getUnseenCount();
+            unreadCount = MrMailbox.getFreshMsgCount(m_mrChat.getId());
        }

        if (mask != 0) {
            boolean continueUpdate = false;
            if (!continueUpdate && (mask & MrMailbox.UPDATE_MASK_AVATAR) != 0) {
-                if (chat == null) {
-                    continueUpdate = true;
-                }
+                continueUpdate = true;
            }
            if (!continueUpdate && (mask & MrMailbox.UPDATE_MASK_NAME) != 0) {
-                if (chat == null) {
-                    continueUpdate = true;
-                }
+                continueUpdate = true;
            }
            if (!continueUpdate && (mask & MrMailbox.UPDATE_MASK_CHAT_AVATAR) != 0) {
-                if (user == null) {
-                    continueUpdate = true;
-                }
+                continueUpdate = true;
            }
            if (!continueUpdate && (mask & MrMailbox.UPDATE_MASK_CHAT_NAME) != 0) {
-                if (user == null) {
-                    continueUpdate = true;
-                }
-            }
-            if (!continueUpdate && (mask & MrMailbox.UPDATE_MASK_SEND_STATE) != 0) {
-                if (message != null && lastSendState != message.messageOwner.send_state) {
-                    lastSendState = message.messageOwner.send_state;
-                    continueUpdate = true;
-                }
+                continueUpdate = true;
            }

            if (!continueUpdate) {
@@ -581,25 +516,15 @@ public class DialogCell extends BaseCell {
            }
        }

-        dialogMuted = isDialogCell && MrMailbox.isDialogMuted(currentDialogId);
-        //user = null;
-        //chat = null;

-        /*int lower_id = (int)currentDialogId;
-        int high_id = (int)(currentDialogId >> 32);
-        if (lower_id != 0) {
-            if (high_id == 1) {
-                chat = MessagesController.getInstance().getChat(lower_id);
-            } else {
-                if (lower_id < 0) {
-                    chat = MessagesController.getInstance().getChat(-lower_id);
-                } else {
-                    user = MessagesController.getInstance().getUser(lower_id);
-                }
-            }
-        }*/

-        ContactsController.setupAvatar(this, avatarImage, avatarDrawable, null, m_mrChat);
+        if( currentChatId == MrChat.MR_CHAT_ID_DEADDROP ) {
+            chatMuted = false; // never draw mute icon, the deaddrop is always muted
+        }
+        else {
+            chatMuted = MrMailbox.isDialogMuted(currentChatId);
+            ContactsController.setupAvatar(this, avatarImage, new AvatarDrawable(), null, m_mrChat);
+        }

        if (getMeasuredWidth() != 0 || getMeasuredHeight() != 0) {
            buildLayout();
@@ -612,21 +537,20 @@ public class DialogCell extends BaseCell {

    @Override
    protected void onDraw(Canvas canvas) {
-        if (currentDialogId == 0) {
+        if( currentChatId == MrChat.MR_CHAT_ID_ARCHIVED_LINK ) {
+            canvas.save();
+            canvas.translate(getMeasuredWidth()/2-flagWidth/2, getMeasuredHeight()/2-flagLayout.getHeight()/2);
+            flagLayout.draw(canvas);
+            canvas.restore();
            return;
        }

-        if (isSelected) {
-            canvas.drawRect(0, 0, getMeasuredWidth(), getMeasuredHeight(), backPaint);
+
+        if (currentChatId == 0) {
+            return;
        }

-        /*
-        if (drawNameLock) {
-            setDrawableBounds(lockDrawable, nameLockLeft, nameLockTop);
-            lockDrawable.draw(canvas);
-        } else
-        */
-        if (drawNameGroup) {
+        if (drawGroupIcon) {
            setDrawableBounds(groupDrawable, nameLockLeft, nameLockTop);
            groupDrawable.draw(canvas);
        }
@@ -669,31 +593,38 @@ public class DialogCell extends BaseCell {
            }
        }

-        if (dialogMuted && !drawVerified) { // TODO: if we enable encrypted chats and show the verified logo, we may show both, muted and verivied
+        if (chatMuted) {
            setDrawableBounds(muteDrawable, nameMuteLeft, AndroidUtilities.dp(16.5f));
            muteDrawable.draw(canvas);
-        } else if (drawVerified) {
-            setDrawableBounds(verifiedDrawable, nameMuteLeft, AndroidUtilities.dp(16.5f));
-            verifiedDrawable.draw(canvas);
        }

        if (drawError) {
            setDrawableBounds(errorDrawable, errorLeft, errorTop);
            errorDrawable.draw(canvas);
+        } else if(drawFlag) {
+            canvas.save();
+            canvas.translate(flagLeft, countTop + AndroidUtilities.dp(4));
+            flagLayout.draw(canvas);
+            canvas.restore();
        } else if (drawCount) {
-            if (dialogMuted) {
-                setDrawableBounds(countDrawableGrey, countLeft - AndroidUtilities.dp(5.5f), countTop, countWidth + AndroidUtilities.dp(11), countDrawable.getIntrinsicHeight());
-                countDrawableGrey.draw(canvas);
-            } else {
-                setDrawableBounds(countDrawable, countLeft - AndroidUtilities.dp(5.5f), countTop, countWidth + AndroidUtilities.dp(11), countDrawable.getIntrinsicHeight());
-                countDrawable.draw(canvas);
-            }
+            setDrawableBounds(countDrawable, countLeft - AndroidUtilities.dp(5.5f), countTop, countWidth + AndroidUtilities.dp(11), countDrawable.getIntrinsicHeight());
+            countDrawable.draw(canvas);
+
            canvas.save();
            canvas.translate(countLeft, countTop + AndroidUtilities.dp(4));
            countLayout.draw(canvas);
            canvas.restore();
        }

+        if( currentChatId==MrChat.MR_CHAT_ID_DEADDROP ) {
+            int shrink = AndroidUtilities.dp(12);
+            setDrawableBounds(closeDrawable, avatarLeft+shrink, avatarTop+shrink, avatarWH-shrink*2, avatarWH-shrink*2);
+            closeDrawable.draw(canvas);
+        }
+        else {
+            avatarImage.draw(canvas);
+        }
+
        if (useSeparator) {
            if (LocaleController.isRTL) {
                canvas.drawLine(0, getMeasuredHeight() - 1, getMeasuredWidth() - AndroidUtilities.dp(AndroidUtilities.leftBaseline), getMeasuredHeight() - 1, linePaint);
@@ -701,8 +632,6 @@ public class DialogCell extends BaseCell {
                canvas.drawLine(AndroidUtilities.dp(AndroidUtilities.leftBaseline), getMeasuredHeight() - 1, getMeasuredWidth(), getMeasuredHeight() - 1, linePaint);
            }
        }
-
-        avatarImage.draw(canvas);
    }

    @Override
@@ -1,6 +1,6 @@
 /*******************************************************************************
 *
- *                          Messenger Android Frontend
+ *                              Delta Chat Android
 *                           (C) 2017 Björn Petersen
 *                    Contact: r10s@b44t.com, http://b44t.com
 *
@@ -25,7 +25,7 @@
 ******************************************************************************/


-package com.b44t.ui.Cells;
+package com.b44t.messenger.Cells;

 import android.content.Context;
 import android.graphics.Canvas;
@@ -39,8 +39,7 @@ import android.widget.FrameLayout;
 import android.widget.TextView;

 import com.b44t.messenger.AndroidUtilities;
-import com.b44t.messenger.LocaleController;
-import com.b44t.ui.Components.LayoutHelper;
+import com.b44t.messenger.Components.LayoutHelper;

 public class EditTextCell extends FrameLayout {

@@ -49,14 +48,20 @@ public class EditTextCell extends FrameLayout {
    private static Paint paint;
    private boolean needDivider;
    private boolean useLabel;
+    private boolean multiLine;

    public EditTextCell(Context context) {
-        this(context, true);
+        this(context, true, false);
    }

-    public EditTextCell(Context context, boolean useLabel__) {
+    public EditTextCell(Context context, boolean useLabel) {
+        this(context, useLabel, false);
+    }
+
+    public EditTextCell(Context context, boolean useLabel__, boolean multiLine__) {
        super(context);
        useLabel = useLabel__;
+        multiLine = multiLine__;

        if (paint == null) {
            paint = new Paint();
@@ -75,41 +80,44 @@ public class EditTextCell extends FrameLayout {
        addView(labelTextView, LayoutHelper.createFrame(LayoutHelper.WRAP_CONTENT, LayoutHelper.WRAP_CONTENT, Gravity.START | Gravity.TOP,
                    17, 8, 17, 0));

-
        editView = new EditText(context);
-        editView.setTextColor(0xff212121); // ok
-        editView.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 18); // ok, normal text is 16
-        editView.setLines(1);
-        editView.setMaxLines(1);
-        editView.setSingleLine(true);
+        editView.setTextColor(0xff212121);
+        editView.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 18); // normal text is 16
+        int addImeFlag = 0, addInputType = 0;
+        if( multiLine__ ) {
+            editView.setLines(2);
+            editView.setMaxLines(2);
+            editView.setSingleLine(false);
+            editView.setVerticalScrollBarEnabled(true);
+            editView.setHorizontalScrollBarEnabled(false);
+            editView.setMinimumHeight(AndroidUtilities.dp(100));
+            addInputType = EditorInfo.TYPE_TEXT_FLAG_MULTI_LINE|EditorInfo.TYPE_TEXT_FLAG_CAP_SENTENCES;
+        }
+        else {
+            editView.setLines(1);
+            editView.setMaxLines(1);
+            editView.setSingleLine(true);
+            addInputType = InputType.TYPE_CLASS_TEXT|InputType.TYPE_TEXT_FLAG_NO_SUGGESTIONS;
+            addImeFlag = EditorInfo.IME_ACTION_DONE; // just close the keyboard, NEXT would not work as the other entries nay not yet loaded
+        }
        editView.setHintTextColor(0xffBBBBBB); // was: 0xff979797
        editView.setGravity(Gravity.START);
-        editView.setInputType(InputType.TYPE_CLASS_TEXT|InputType.TYPE_TEXT_FLAG_NO_SUGGESTIONS);
-        editView.setImeOptions(EditorInfo.IME_ACTION_DONE); // just close the keyboard, NEXT would not work as the other entries nay not yet loaded
-        AndroidUtilities.clearCursorDrawable(editView);
-        /*
-        e.setPadding(0, 0, 0, 0);
-        e.setOnEditorActionListener(new TextView.OnEditorActionListener() {
-            @Override
-            public boolean onEditorAction(TextView textView, int i, KeyEvent keyEvent) {
-                if (i == EditorInfo.IME_ACTION_DONE && doneButton != null) {
-                    doneButton.performClick();
-                    return true;
-                }
-                return false;
-            }
-        });
-        */
+        editView.setInputType(editView.getInputType()|addInputType);
+        editView.setImeOptions(addImeFlag|EditorInfo.IME_FLAG_NO_EXTRACT_UI);

        addView(editView, LayoutHelper.createFrame(LayoutHelper.MATCH_PARENT, LayoutHelper.WRAP_CONTENT, Gravity.START | Gravity.TOP,
-                17, useLabel? 25 : 25-17, 17, 0));
+                17, useLabel? 25 : 25-17, 17, multiLine?17:0));

        setBackgroundColor(0xffffffff);
    }

    @Override
    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
-        super.onMeasure(widthMeasureSpec, MeasureSpec.makeMeasureSpec(AndroidUtilities.dp(useLabel? 64 : 64-15) + (needDivider ? 1 : 0), MeasureSpec.EXACTLY));
+        int dpheight = multiLine? 49*2 : 49;
+        if( useLabel ) {
+            dpheight += 15;
+        }
+        super.onMeasure(widthMeasureSpec, MeasureSpec.makeMeasureSpec(AndroidUtilities.dp(dpheight)+(needDivider ? 1 : 0), MeasureSpec.EXACTLY));
    }

    public void setValueHintAndLabel(String value, String hint, String label, boolean divider) {
@@ -1,6 +1,6 @@
 /*******************************************************************************
 *
- *                          Messenger Android Frontend
+ *                              Delta Chat Android
 *                        (C) 2013-2016 Nikolai Kudashov
 *                           (C) 2017 Björn Petersen
 *                    Contact: r10s@b44t.com, http://b44t.com
@@ -21,7 +21,7 @@
 ******************************************************************************/


-package com.b44t.ui.Cells;
+package com.b44t.messenger.Cells;

 import android.content.Context;
 import android.widget.FrameLayout;
@@ -1,6 +1,6 @@
 /*******************************************************************************
 *
- *                          Messenger Android Frontend
+ *                              Delta Chat Android
 *                        (C) 2013-2016 Nikolai Kudashov
 *                           (C) 2017 Björn Petersen
 *                    Contact: r10s@b44t.com, http://b44t.com
@@ -21,7 +21,7 @@
 ******************************************************************************/


-package com.b44t.ui.Cells;
+package com.b44t.messenger.Cells;

 import android.content.Context;
 import android.graphics.Typeface;
@@ -31,8 +31,7 @@ import android.widget.FrameLayout;
 import android.widget.TextView;

 import com.b44t.messenger.AndroidUtilities;
-import com.b44t.messenger.LocaleController;
-import com.b44t.ui.Components.LayoutHelper;
+import com.b44t.messenger.Components.LayoutHelper;

 public class GreySectionCell extends FrameLayout {
    private TextView textView;
@@ -1,6 +1,6 @@
 /*******************************************************************************
 *
- *                          Messenger Android Frontend
+ *                              Delta Chat Android
 *                        (C) 2013-2016 Nikolai Kudashov
 *                           (C) 2017 Björn Petersen
 *                    Contact: r10s@b44t.com, http://b44t.com
@@ -21,7 +21,7 @@
 ******************************************************************************/


-package com.b44t.ui.Cells;
+package com.b44t.messenger.Cells;

 import android.content.Context;
 import android.graphics.Typeface;
@@ -31,21 +31,28 @@ import android.widget.FrameLayout;
 import android.widget.TextView;

 import com.b44t.messenger.AndroidUtilities;
-import com.b44t.messenger.LocaleController;
-import com.b44t.ui.Components.LayoutHelper;
+import com.b44t.messenger.Components.LayoutHelper;

 public class HeaderCell extends FrameLayout {

    private TextView textView;

+    static public TextView createTextView(Context context, String text)
+    {
+        TextView ret = new TextView(context);
+        ret.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 15);
+        ret.setTypeface(Typeface.DEFAULT_BOLD);
+        ret.setTextColor(0xff5099c9);
+        ret.setGravity(Gravity.START | Gravity.CENTER_VERTICAL);
+        if( text != null ) {
+            ret.setText(text);
+        }
+        return ret;
+    }
+
    public HeaderCell(Context context) {
        super(context);
-
-        textView = new TextView(getContext());
-        textView.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 15);
-        textView.setTypeface(Typeface.DEFAULT_BOLD);
-        textView.setTextColor(0xff5099c9);
-        textView.setGravity(Gravity.START | Gravity.CENTER_VERTICAL);
+        textView = createTextView(getContext(), null);
        addView(textView, LayoutHelper.createFrame(LayoutHelper.MATCH_PARENT, LayoutHelper.MATCH_PARENT, Gravity.START | Gravity.TOP, 17, 15, 17, 0));
    }

@@ -1,6 +1,6 @@
 /*******************************************************************************
 *
- *                          Messenger Android Frontend
+ *                              Delta Chat Android
 *                        (C) 2013-2016 Nikolai Kudashov
 *                           (C) 2017 Björn Petersen
 *                    Contact: r10s@b44t.com, http://b44t.com
@@ -21,7 +21,7 @@
 ******************************************************************************/


-package com.b44t.ui.Cells;
+package com.b44t.messenger.Cells;

 import android.content.Context;
 import android.graphics.Rect;
@@ -34,10 +34,10 @@ import android.widget.FrameLayout;
 import com.b44t.messenger.AndroidUtilities;
 import com.b44t.messenger.MediaController;
 import com.b44t.messenger.R;
-import com.b44t.ui.Components.BackupImageView;
-import com.b44t.ui.Components.CheckBoxView;
-import com.b44t.ui.Components.LayoutHelper;
-import com.b44t.ui.PhotoViewer;
+import com.b44t.messenger.Components.BackupImageView;
+import com.b44t.messenger.Components.CheckBoxView;
+import com.b44t.messenger.Components.LayoutHelper;
+import com.b44t.messenger.PhotoViewer;

 public class PhotoAttachPhotoCell extends FrameLayout {

@@ -1,6 +1,6 @@
 /*******************************************************************************
 *
- *                          Messenger Android Frontend
+ *                              Delta Chat Android
 *                        (C) 2013-2016 Nikolai Kudashov
 *                           (C) 2017 Björn Petersen
 *                    Contact: r10s@b44t.com, http://b44t.com
@@ -21,7 +21,7 @@
 ******************************************************************************/


-package com.b44t.ui.Cells;
+package com.b44t.messenger.Cells;

 import android.content.Context;
 import android.text.TextUtils;
@@ -32,7 +32,7 @@ import android.widget.ImageView;
 import android.widget.TextView;

 import com.b44t.messenger.AndroidUtilities;
-import com.b44t.ui.Components.LayoutHelper;
+import com.b44t.messenger.Components.LayoutHelper;

 public class PhotoEditToolCell extends FrameLayout {

@@ -1,6 +1,6 @@
 /*******************************************************************************
 *
- *                          Messenger Android Frontend
+ *                              Delta Chat Android
 *                        (C) 2013-2016 Nikolai Kudashov
 *                           (C) 2017 Björn Petersen
 *                    Contact: r10s@b44t.com, http://b44t.com
@@ -21,7 +21,7 @@
 ******************************************************************************/


-package com.b44t.ui.Cells;
+package com.b44t.messenger.Cells;

 import android.content.Context;
 import android.os.Build;
@@ -37,8 +37,8 @@ import android.widget.TextView;
 import com.b44t.messenger.AndroidUtilities;
 import com.b44t.messenger.MediaController;
 import com.b44t.messenger.R;
-import com.b44t.ui.Components.BackupImageView;
-import com.b44t.ui.Components.LayoutHelper;
+import com.b44t.messenger.Components.BackupImageView;
+import com.b44t.messenger.Components.LayoutHelper;

 public class PhotoPickerAlbumsCell extends FrameLayout {

@@ -158,11 +158,7 @@ public class PhotoPickerAlbumsCell extends FrameLayout {
    @Override
    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
        int itemWidth;
-        if (AndroidUtilities.isTablet()) {
-            itemWidth = (AndroidUtilities.dp(490) - ((albumsCount + 1) * AndroidUtilities.dp(4))) / albumsCount;
-        } else {
-            itemWidth = (AndroidUtilities.displaySize.x - ((albumsCount + 1) * AndroidUtilities.dp(4))) / albumsCount;
-        }
+        itemWidth = (AndroidUtilities.displaySize.x - ((albumsCount + 1) * AndroidUtilities.dp(4))) / albumsCount;

        for (int a = 0; a < albumsCount; a++) {
            LayoutParams layoutParams = (LayoutParams) albumViews[a].getLayoutParams();
@@ -1,6 +1,6 @@
 /*******************************************************************************
 *
- *                          Messenger Android Frontend
+ *                              Delta Chat Android
 *                        (C) 2013-2016 Nikolai Kudashov
 *                           (C) 2017 Björn Petersen
 *                    Contact: r10s@b44t.com, http://b44t.com
@@ -21,7 +21,7 @@
 ******************************************************************************/


-package com.b44t.ui.Cells;
+package com.b44t.messenger.Cells;

 import android.animation.Animator;
 import android.animation.AnimatorSet;
@@ -33,9 +33,9 @@ import android.widget.FrameLayout;
 import com.b44t.messenger.AndroidUtilities;
 import com.b44t.messenger.AnimatorListenerAdapterProxy;
 import com.b44t.messenger.R;
-import com.b44t.ui.Components.BackupImageView;
-import com.b44t.ui.Components.CheckBoxView;
-import com.b44t.ui.Components.LayoutHelper;
+import com.b44t.messenger.Components.BackupImageView;
+import com.b44t.messenger.Components.CheckBoxView;
+import com.b44t.messenger.Components.LayoutHelper;

 public class PhotoPickerPhotoCell extends FrameLayout {

@@ -1,7 +1,6 @@
 /*******************************************************************************
 *
- *                          Messenger Android Frontend
- *                        (C) 2013-2016 Nikolai Kudashov
+ *                              Delta Chat Android
 *                           (C) 2017 Björn Petersen
 *                    Contact: r10s@b44t.com, http://b44t.com
 *
@@ -21,14 +20,12 @@
 ******************************************************************************/


-package com.b44t.ui.Cells;
+package com.b44t.messenger.Cells;

 import android.content.Context;
 import android.graphics.Bitmap;
 import android.graphics.Canvas;
 import android.graphics.Paint;
-import android.graphics.PorterDuff;
-import android.graphics.PorterDuffColorFilter;
 import android.graphics.Rect;
 import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.ColorDrawable;
@@ -42,14 +39,13 @@ import android.widget.ImageView;
 import android.widget.TextView;

 import com.b44t.messenger.AndroidUtilities;
-import com.b44t.messenger.LocaleController;
 import com.b44t.messenger.MrMailbox;
 import com.b44t.messenger.ApplicationLoader;
 import com.b44t.messenger.R;
-import com.b44t.ui.Components.LayoutHelper;
-import com.b44t.ui.ActionBar.Theme;
+import com.b44t.messenger.Components.LayoutHelper;
+import com.b44t.messenger.ActionBar.Theme;

-public class DrawerProfileCell extends FrameLayout {
+public class SettingsProfileCell extends FrameLayout {

    private TextView nameTextView;
    private TextView subtitleTextView;
@@ -57,18 +53,18 @@ public class DrawerProfileCell extends FrameLayout {
    private Rect destRect = new Rect();
    private Paint paint = new Paint();

-    public DrawerProfileCell(Context context) {
+    public SettingsProfileCell(Context context) {
        super(context);
        setBackgroundColor(Theme.ACTION_BAR_COLOR);

        ImageView shadowView = new ImageView(context);
        shadowView.setScaleType(ImageView.ScaleType.FIT_XY);
        shadowView.setImageResource(R.drawable.bottom_shadow);
-        addView(shadowView, LayoutHelper.createFrame(LayoutHelper.MATCH_PARENT, 100/*EDIT BY MR, was 70*/, Gravity.START | Gravity.BOTTOM));
+        addView(shadowView, LayoutHelper.createFrame(LayoutHelper.MATCH_PARENT, 85/*shadow height*/, Gravity.START | Gravity.BOTTOM));

        nameTextView = new TextView(context);
        nameTextView.setTextColor(0xffffffff);
-        nameTextView.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 23);
+        nameTextView.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 26);
        nameTextView.setLines(1);
        nameTextView.setMaxLines(1);
        nameTextView.setSingleLine(true);
@@ -78,7 +74,7 @@ public class DrawerProfileCell extends FrameLayout {

        subtitleTextView = new TextView(context);
        subtitleTextView.setTextColor(0xffc2e5ff);
-        subtitleTextView.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 13);
+        subtitleTextView.setTextSize(TypedValue.COMPLEX_UNIT_DIP, Theme.ACTION_BAR_SUBTITLE_TEXT_SIZE);
        subtitleTextView.setLines(1);
        subtitleTextView.setMaxLines(1);
        subtitleTextView.setSingleLine(true);
@@ -89,7 +85,7 @@ public class DrawerProfileCell extends FrameLayout {

    @Override
    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
-        int mrHeight = 180;
+        int mrHeight = 100/*see also shadow height above*/;
        if (Build.VERSION.SDK_INT >= 21) {
            super.onMeasure(widthMeasureSpec, MeasureSpec.makeMeasureSpec(AndroidUtilities.dp(mrHeight) + AndroidUtilities.statusBarHeight, MeasureSpec.EXACTLY));
        } else {
@@ -1,6 +1,6 @@
 /*******************************************************************************
 *
- *                          Messenger Android Frontend
+ *                              Delta Chat Android
 *                        (C) 2013-2016 Nikolai Kudashov
 *                           (C) 2017 Björn Petersen
 *                    Contact: r10s@b44t.com, http://b44t.com
@@ -21,7 +21,7 @@
 ******************************************************************************/


-package com.b44t.ui.Cells;
+package com.b44t.messenger.Cells;

 import android.content.Context;
 import android.view.View;
@@ -1,6 +1,6 @@
 /*******************************************************************************
 *
- *                          Messenger Android Frontend
+ *                              Delta Chat Android
 *                        (C) 2013-2016 Nikolai Kudashov
 *                           (C) 2017 Björn Petersen
 *                    Contact: r10s@b44t.com, http://b44t.com
@@ -21,7 +21,7 @@
 ******************************************************************************/


-package com.b44t.ui.Cells;
+package com.b44t.messenger.Cells;

 import android.content.Context;
 import android.graphics.Paint;
@@ -36,9 +36,9 @@ import com.b44t.messenger.AndroidUtilities;
 import com.b44t.messenger.ImageReceiver;
 import com.b44t.messenger.LocaleController;
 import com.b44t.messenger.R;
-import com.b44t.ui.Components.BackupImageView;
-import com.b44t.ui.Components.CheckBoxView;
-import com.b44t.ui.Components.LayoutHelper;
+import com.b44t.messenger.Components.BackupImageView;
+import com.b44t.messenger.Components.CheckBoxView;
+import com.b44t.messenger.Components.LayoutHelper;

 public class SharedDocumentCell extends FrameLayout {

@@ -1,6 +1,6 @@
 /*******************************************************************************
 *
- *                          Messenger Android Frontend
+ *                              Delta Chat Android
 *                        (C) 2013-2016 Nikolai Kudashov
 *                           (C) 2017 Björn Petersen
 *                    Contact: r10s@b44t.com, http://b44t.com
@@ -21,7 +21,7 @@
 ******************************************************************************/


-package com.b44t.ui.Cells;
+package com.b44t.messenger.Cells;

 import android.content.Context;
 import android.graphics.drawable.Drawable;
@@ -31,7 +31,7 @@ import android.widget.ImageView;

 import com.b44t.messenger.AndroidUtilities;
 import com.b44t.messenger.LocaleController;
-import com.b44t.ui.ActionBar.SimpleTextView;
+import com.b44t.messenger.ActionBar.SimpleTextView;

 public class TextCell extends FrameLayout {

@@ -1,6 +1,6 @@
 /*******************************************************************************
 *
- *                          Messenger Android Frontend
+ *                              Delta Chat Android
 *                        (C) 2013-2016 Nikolai Kudashov
 *                           (C) 2017 Björn Petersen
 *                    Contact: r10s@b44t.com, http://b44t.com
@@ -21,7 +21,7 @@
 ******************************************************************************/


-package com.b44t.ui.Cells;
+package com.b44t.messenger.Cells;

 import android.content.Context;
 import android.graphics.Canvas;
@@ -35,7 +35,7 @@ import android.widget.CheckBox;

 import com.b44t.messenger.AndroidUtilities;
 import com.b44t.messenger.LocaleController;
-import com.b44t.ui.Components.LayoutHelper;
+import com.b44t.messenger.Components.LayoutHelper;

 public class TextCheckCell extends FrameLayout {

@@ -1,6 +1,6 @@
 /*******************************************************************************
 *
- *                          Messenger Android Frontend
+ *                              Delta Chat Android
 *                        (C) 2013-2016 Nikolai Kudashov
 *                           (C) 2017 Björn Petersen
 *                    Contact: r10s@b44t.com, http://b44t.com
@@ -21,7 +21,7 @@
 ******************************************************************************/


-package com.b44t.ui.Cells;
+package com.b44t.messenger.Cells;

 import android.content.Context;
 import android.graphics.Canvas;
@@ -32,8 +32,7 @@ import android.widget.FrameLayout;
 import android.widget.TextView;

 import com.b44t.messenger.AndroidUtilities;
-import com.b44t.messenger.LocaleController;
-import com.b44t.ui.Components.LayoutHelper;
+import com.b44t.messenger.Components.LayoutHelper;

 public class TextDetailSettingsCell extends FrameLayout {

@@ -1,6 +1,6 @@
 /*******************************************************************************
 *
- *                          Messenger Android Frontend
+ *                              Delta Chat Android
 *                           (C) 2017 Björn Petersen
 *                    Contact: r10s@b44t.com, http://b44t.com
 *
@@ -20,7 +20,7 @@
 ******************************************************************************/


-package com.b44t.ui.Cells;
+package com.b44t.messenger.Cells;

 import android.content.Context;
 import android.util.TypedValue;
@@ -29,8 +29,7 @@ import android.widget.FrameLayout;
 import android.widget.TextView;

 import com.b44t.messenger.AndroidUtilities;
-import com.b44t.messenger.LocaleController;
-import com.b44t.ui.Components.LayoutHelper;
+import com.b44t.messenger.Components.LayoutHelper;


 public class TextInfoCell extends FrameLayout {
@@ -1,6 +1,6 @@
 /*******************************************************************************
 *
- *                          Messenger Android Frontend
+ *                              Delta Chat Android
 *                        (C) 2013-2016 Nikolai Kudashov
 *                           (C) 2017 Björn Petersen
 *                    Contact: r10s@b44t.com, http://b44t.com
@@ -21,7 +21,7 @@
 ******************************************************************************/


-package com.b44t.ui.Cells;
+package com.b44t.messenger.Cells;

 import android.content.Context;
 import android.graphics.Canvas;
@@ -30,12 +30,10 @@ import android.text.TextUtils;
 import android.util.TypedValue;
 import android.view.Gravity;
 import android.widget.FrameLayout;
-import android.widget.ImageView;
 import android.widget.TextView;

 import com.b44t.messenger.AndroidUtilities;
-import com.b44t.messenger.LocaleController;
-import com.b44t.ui.Components.LayoutHelper;
+import com.b44t.messenger.Components.LayoutHelper;

 import static com.b44t.messenger.AndroidUtilities.dp;

@@ -1,6 +1,6 @@
 /*******************************************************************************
 *
- *                          Messenger Android Frontend
+ *                              Delta Chat Android
 *                        (C) 2013-2016 Nikolai Kudashov
 *                           (C) 2017 Björn Petersen
 *                    Contact: r10s@b44t.com, http://b44t.com
@@ -21,7 +21,7 @@
 ******************************************************************************/


-package com.b44t.ui.Cells;
+package com.b44t.messenger.Cells;

 import android.content.Context;
 import android.view.Gravity;
@@ -33,11 +33,11 @@ import com.b44t.messenger.ContactsController;
 import com.b44t.messenger.LocaleController;
 import com.b44t.messenger.MrContact;
 import com.b44t.messenger.R;
-import com.b44t.ui.Components.AvatarDrawable;
-import com.b44t.ui.Components.BackupImageView;
-import com.b44t.ui.Components.CheckBoxView;
-import com.b44t.ui.Components.LayoutHelper;
-import com.b44t.ui.ActionBar.SimpleTextView;
+import com.b44t.messenger.Components.AvatarDrawable;
+import com.b44t.messenger.Components.BackupImageView;
+import com.b44t.messenger.Components.CheckBoxView;
+import com.b44t.messenger.Components.LayoutHelper;
+import com.b44t.messenger.ActionBar.SimpleTextView;

 public class UserCell extends FrameLayout {

@@ -1,6 +1,6 @@
 /*******************************************************************************
 *
- *                          Messenger Android Frontend
+ *                              Delta Chat Android
 *                        (C) 2013-2016 Nikolai Kudashov
 *                           (C) 2017 Björn Petersen
 *                    Contact: r10s@b44t.com, http://b44t.com
@@ -21,7 +21,7 @@
 ******************************************************************************/


-package com.b44t.ui.Cells;
+package com.b44t.messenger.Cells;

 import android.content.Context;
 import android.graphics.drawable.Drawable;
@@ -33,8 +33,8 @@ import android.widget.ImageView;
 import com.b44t.messenger.AndroidUtilities;
 import com.b44t.messenger.R;
 import com.b44t.messenger.TLRPC;
-import com.b44t.ui.Components.BackupImageView;
-import com.b44t.ui.Components.LayoutHelper;
+import com.b44t.messenger.Components.BackupImageView;
+import com.b44t.messenger.Components.LayoutHelper;

 public class WallpaperCell extends FrameLayout {

@@ -1,6 +1,6 @@
 /*******************************************************************************
 *
- *                          Messenger Android Frontend
+ *                              Delta Chat Android
 *                        (C) 2013-2016 Nikolai Kudashov
 *                           (C) 2017 Björn Petersen
 *                    Contact: r10s@b44t.com, http://b44t.com
@@ -21,7 +21,7 @@
 ******************************************************************************/


-package com.b44t.ui;
+package com.b44t.messenger;

 import android.Manifest;
 import android.animation.Animator;
@@ -43,10 +43,12 @@ import android.os.Build;
 import android.os.Bundle;
 import android.provider.MediaStore;
 import android.support.v4.content.FileProvider;
+import android.text.Editable;
 import android.text.TextUtils;
+import android.text.TextWatcher;
 import android.text.style.ClickableSpan;
 import android.text.style.URLSpan;
-import android.util.Log;
+import android.util.SparseIntArray;
 import android.util.TypedValue;
 import android.view.Gravity;
 import android.view.MotionEvent;
@@ -59,45 +61,26 @@ import android.widget.ImageView;
 import android.widget.TextView;
 import android.widget.Toast;

-import com.b44t.messenger.AndroidUtilities;
-import com.b44t.messenger.BuildConfig;
-import com.b44t.messenger.LocaleController;
-import com.b44t.messenger.MediaController;
-import com.b44t.messenger.MrChat;
-import com.b44t.messenger.MrContact;
-import com.b44t.messenger.MrMailbox;
-import com.b44t.messenger.MrMsg;
-import com.b44t.messenger.NotificationsController;
-import com.b44t.messenger.SendMessagesHelper;
-import com.b44t.messenger.Utilities;
-import com.b44t.messenger.VideoEditedInfo;
-import com.b44t.messenger.browser.Browser;
-import com.b44t.messenger.support.widget.LinearLayoutManager;
-import com.b44t.messenger.support.widget.RecyclerView;
-import com.b44t.messenger.ApplicationLoader;
-import com.b44t.messenger.TLRPC;
-import com.b44t.messenger.MessageObject;
-import com.b44t.messenger.NotificationCenter;
-import com.b44t.messenger.R;
-import com.b44t.ui.ActionBar.BackDrawable;
-import com.b44t.ui.ActionBar.SimpleTextView;
-import com.b44t.messenger.AnimatorListenerAdapterProxy;
-import com.b44t.ui.Cells.ChatActionCell;
-import com.b44t.ui.ActionBar.ActionBar;
-import com.b44t.ui.ActionBar.ActionBarMenu;
-import com.b44t.ui.ActionBar.ActionBarMenuItem;
-import com.b44t.ui.Cells.ChatMessageCell;
-import com.b44t.ui.Cells.ChatUnreadCell;
-import com.b44t.ui.ActionBar.BaseFragment;
-import com.b44t.ui.Components.ChatActivityEnterView;
-import com.b44t.messenger.ImageReceiver;
-import com.b44t.ui.Components.ChatAttachAlert;
-import com.b44t.ui.Components.ChatAvatarContainer;
-import com.b44t.ui.Components.LayoutHelper;
-import com.b44t.ui.Components.NumberTextView;
-import com.b44t.ui.Components.RecyclerListView;
-import com.b44t.ui.Components.SizeNotifierFrameLayout;
-import com.b44t.ui.ActionBar.Theme;
+import com.b44t.messenger.Components.Browser;
+import com.b44t.messenger.aosp.LinearLayoutManager;
+import com.b44t.messenger.aosp.RecyclerView;
+import com.b44t.messenger.ActionBar.BackDrawable;
+import com.b44t.messenger.ActionBar.SimpleTextView;
+import com.b44t.messenger.Cells.ChatActionCell;
+import com.b44t.messenger.ActionBar.ActionBar;
+import com.b44t.messenger.ActionBar.ActionBarMenu;
+import com.b44t.messenger.ActionBar.ActionBarMenuItem;
+import com.b44t.messenger.Cells.ChatMessageCell;
+import com.b44t.messenger.Cells.ChatUnreadCell;
+import com.b44t.messenger.ActionBar.BaseFragment;
+import com.b44t.messenger.Components.ChatActivityEnterView;
+import com.b44t.messenger.Components.ChatAttachAlert;
+import com.b44t.messenger.Components.ChatAvatarContainer;
+import com.b44t.messenger.Components.LayoutHelper;
+import com.b44t.messenger.Components.NumberTextView;
+import com.b44t.messenger.Components.RecyclerListView;
+import com.b44t.messenger.Components.SizeNotifierFrameLayout;
+import com.b44t.messenger.ActionBar.Theme;

 import java.io.File;
 import java.net.URLDecoder;
@@ -106,12 +89,13 @@ import java.util.Collections;
 import java.util.HashMap;

@SuppressWarnings("unchecked")
-public class ChatActivity extends BaseFragment implements NotificationCenter.NotificationCenterDelegate, DialogsActivity.DialogsActivityDelegate,
+public class ChatActivity extends BaseFragment implements NotificationCenter.NotificationCenterDelegate, ChatlistActivity.ChatlistActivityDelegate,
        PhotoViewer.PhotoViewerProvider {

    // data
    private long  dialog_id;
    public MrChat m_mrChat = new MrChat(0);
+    private boolean m_isChatWithDeaddrop /*, m_isDeaddropInChatlist*/;
    private int[] m_msglist = {};

    // the list view
@@ -151,7 +135,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not

    private boolean paused = true;
    private boolean wasPaused = false;
-    private boolean readWhenResume = false;
+    private SparseIntArray markseenWhenResume = new SparseIntArray();

    private boolean scrollToTopOnResume;
    private boolean forceScrollToTop;
@@ -178,8 +162,11 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
    private final static int ID_COPY = 10;
    private final static int ID_FORWARD = 11;
    private final static int ID_DELETE_MESSAGES = 12;
+    private final static int ID_LEAVE_GROUP = 13;
    private final static int ID_ATTACH = 14;
+    private final static int ID_SHOW_PROFILE = 15;
    private final static int ID_DELETE_CHAT = 16;
+    private final static int ID_ARCHIVE_CHAT = 17;
    private final static int ID_MUTE = 18;
    private final static int ID_REPLY = 19;
    private final static int ID_INFO = 20;
@@ -202,11 +189,16 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not

        dialog_id = arguments.getInt("chat_id", 0);
        m_mrChat = MrMailbox.getChat((int)dialog_id);
+        m_isChatWithDeaddrop = m_mrChat.getId()==MrChat.MR_CHAT_ID_DEADDROP;
+
+        /*m_isDeaddropInChatlist = false;
+        if( m_isChatWithDeaddrop && MrMailbox.getConfigInt("show_deaddrop", 0)!=0 ) {
+            m_isDeaddropInChatlist = true;
+        }*/

        startLoadFromMessageId = arguments.getInt("message_id", 0);
        scrollToTopOnResume = arguments.getBoolean("scrollToTopOnResume", false);

-        NotificationCenter.getInstance().addObserver(this, NotificationCenter.emojiDidLoaded);
        NotificationCenter.getInstance().addObserver(this, NotificationCenter.dialogsNeedReload);
        NotificationCenter.getInstance().addObserver(this, NotificationCenter.updateInterfaces);
        NotificationCenter.getInstance().addObserver(this, NotificationCenter.didReceivedNewMessages);
@@ -224,10 +216,6 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
        NotificationCenter.getInstance().addObserver(this, NotificationCenter.waveformCalculated);
        NotificationCenter.getInstance().addObserver(this, NotificationCenter.notificationsSettingsUpdated);

-        if (AndroidUtilities.isTablet()) {
-            NotificationCenter.getInstance().postNotificationName(NotificationCenter.openedChatChanged, dialog_id, false);
-        }
-
        AndroidUtilities.runOnUIThread(new Runnable() {
            @Override
            public void run() {
@@ -257,7 +245,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
            }
        });

-        if (m_mrChat.getId() == MrChat.MR_CHAT_ID_DEADDROP) {
+        if (m_isChatWithDeaddrop) {
            updateBottomOverlay();
        }

@@ -317,7 +305,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
            AndroidUtilities.runOnUIThread(new Runnable() {
                @Override
                public void run() {
-                    MrMailbox.markseenChat((int)dialog_id);
+                    MrMailbox.marknoticedChat((int)dialog_id);
                    NotificationsController.getInstance().removeSeenMessages();
                }
            }, 700);
@@ -336,7 +324,6 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
            chatActivityEnterView.onDestroy();
        }

-        NotificationCenter.getInstance().removeObserver(this, NotificationCenter.emojiDidLoaded);
        NotificationCenter.getInstance().removeObserver(this, NotificationCenter.dialogsNeedReload);
        NotificationCenter.getInstance().removeObserver(this, NotificationCenter.updateInterfaces);
        NotificationCenter.getInstance().removeObserver(this, NotificationCenter.didReceivedNewMessages);
@@ -354,10 +341,6 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
        NotificationCenter.getInstance().removeObserver(this, NotificationCenter.notificationsSettingsUpdated);
        NotificationCenter.getInstance().removeObserver(this, NotificationCenter.audioPlayStateChanged);

-        if (AndroidUtilities.isTablet()) {
-            NotificationCenter.getInstance().postNotificationName(NotificationCenter.openedChatChanged, dialog_id, true);
-        }
-
        /*
        if (currentUser != null) {
            MessagesController.getInstance().cancelLoadFullUser(currentUser.id);
@@ -435,9 +418,49 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
                    args.putBoolean("onlySelect", true);
                    args.putString("onlySelectTitle", context.getString(R.string.ForwardToTitle));
                    args.putString("selectAlertString", context.getString(R.string.ForwardMessagesTo));
-                    DialogsActivity fragment = new DialogsActivity(args);
+                    ChatlistActivity fragment = new ChatlistActivity(args);
                    fragment.setDelegate(ChatActivity.this);
-                    presentFragment(fragment); // this results in a call to didSelectDialog()
+                    presentFragment(fragment); // this results in a call to didSelectChat()
+                }
+                else if( id == ID_SHOW_PROFILE )
+                {
+                    Bundle args = new Bundle();
+                    if( m_mrChat.getType()== MrChat.MR_CHAT_GROUP ) {
+                        args.putInt("chat_id",  m_mrChat.getId());
+                    }
+                    else {
+                        int[] contact_ids = MrMailbox.getChatContacts(m_mrChat.getId());
+                        if( contact_ids.length==0) {
+                            return; // should not happen
+                        }
+                        args.putInt("user_id", contact_ids[0]);
+                    }
+                    ProfileActivity fragment = new ProfileActivity(args);
+                    presentFragment(fragment);
+                }
+                else if( id == ID_LEAVE_GROUP )
+                {
+                    AlertDialog.Builder builder = new AlertDialog.Builder(getParentActivity());
+                    builder.setPositiveButton(R.string.OK, new DialogInterface.OnClickListener() {
+                        @Override
+                        public void onClick(DialogInterface dialogInterface, int i) {
+                            MrMailbox.removeContactFromChat(m_mrChat.getId(), MrContact.MR_CONTACT_ID_SELF);
+                            NotificationCenter.getInstance().postNotificationName(NotificationCenter.updateInterfaces, MrMailbox.UPDATE_MASK_CHAT_MEMBERS);
+                            AndroidUtilities.showDoneHint(context);
+                        }
+                    });
+                    builder.setNegativeButton(R.string.Cancel, null);
+                    builder.setMessage(AndroidUtilities.replaceTags(context.getString(R.string.AskLeaveGroup)));
+                    showDialog(builder.create());
+                }
+                else if ( id == ID_ARCHIVE_CHAT)
+                {
+                    int do_archive = m_mrChat.getArchived()==0? 1: 0;
+                    MrMailbox.archiveChat((int)dialog_id, do_archive);
+                    AndroidUtilities.showDoneHint(context);
+                    if( do_archive == 1 ) {
+                        finishFragment();
+                    }
                }
                else if ( id == ID_DELETE_CHAT)
                {
@@ -449,24 +472,20 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not

                    AlertDialog.Builder builder = new AlertDialog.Builder(getParentActivity());
                    builder.setMessage(context.getString(R.string.AreYouSureDeleteThisChat));
-                    builder.setPositiveButton(context.getString(R.string.OK), new DialogInterface.OnClickListener() {
+                    builder.setPositiveButton(R.string.OK, new DialogInterface.OnClickListener() {
                        @Override
                        public void onClick(DialogInterface dialogInterface, int i) {
-                            if( MrMailbox.deleteChat((int)dialog_id)!=0 ) {
-                                AndroidUtilities.showDoneHint(getParentActivity());
-                                finishFragment();
-                            }
-                            else {
-                                AndroidUtilities.showErrorHint(getParentActivity()); // normally, there is no reason for deleteChat to fail() as everything is just local
-                            }
+                            MrMailbox.deleteChat((int)dialog_id);
+                            AndroidUtilities.showDoneHint(getParentActivity());
+                            finishFragment();
                        }
                    });
-                    builder.setNegativeButton(context.getString(R.string.Cancel), null);
+                    builder.setNegativeButton(R.string.Cancel, null);
                    showDialog(builder.create());
                } else if (id == ID_MUTE) {
                    toggleMute();
                } else if (id == ID_REPLY) {
-                    if( m_mrChat.getId()==MrChat.MR_CHAT_ID_DEADDROP ){
+                    if( m_isChatWithDeaddrop ){
                        if( selectedMessagesIds!=null && selectedMessagesIds.size()==1) {
                            ArrayList<Integer> ids = new ArrayList<>(selectedMessagesIds.keySet());
                            createChatByDeaddropMsgId(ids.get(0));
@@ -480,12 +499,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
                    String info_str = MrMailbox.getMsgInfo(getFirstSelectedId());
                    AlertDialog.Builder builder = new AlertDialog.Builder(getParentActivity());
                    builder.setMessage(info_str);
-                    builder.setPositiveButton(context.getString(R.string.OK), new DialogInterface.OnClickListener() {
-                        @Override
-                        public void onClick(DialogInterface dialogInterface, int i) {
-                            ;
-                        }
-                    });
+                    builder.setPositiveButton(R.string.OK, null);
                    showDialog(builder.create());
                    actionBar.hideActionMode();
                    updateVisibleRowsFast();
@@ -527,15 +541,22 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
            }
        });

-        avatarContainer = new ChatAvatarContainer(context, this);
-        actionBar.addView(avatarContainer, 0, LayoutHelper.createFrame(LayoutHelper.WRAP_CONTENT, LayoutHelper.MATCH_PARENT, Gravity.TOP | Gravity.START, 56, 0, 40, 0));
+        if( m_isChatWithDeaddrop /*&& !m_isDeaddropInChatlist*/ ) {
+            actionBar.setTitle(context.getString(R.string.Deaddrop));
+        }
+        else {
+            avatarContainer = new ChatAvatarContainer(context, this);
+            actionBar.addView(avatarContainer, 0, LayoutHelper.createFrame(LayoutHelper.WRAP_CONTENT, LayoutHelper.MATCH_PARENT, Gravity.TOP | Gravity.START, ActionBar.AVATAR_AFTER_BACK_X, 0, 40, 0));
+        }

        ActionBarMenu menu = actionBar.createMenu();

        searchItem = menu.addItem(0, R.drawable.ic_ab_search).setIsSearchField(true, false).setActionBarMenuItemSearchListener(new ActionBarMenuItem.ActionBarMenuItemSearchListener() {
            @Override
            public void onSearchCollapse() {
-                avatarContainer.setVisibility(View.VISIBLE);
+                if( avatarContainer != null ) {
+                    avatarContainer.setVisibility(View.VISIBLE);
+                }
                headerItem.setVisibility(View.VISIBLE);
                searchItem.setVisibility(View.GONE);
                highlightMessageId = 0;
@@ -579,13 +600,10 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not


        headerItem = menu.addItem(0, R.drawable.ic_ab_other);
-        if (searchItem != null) {
-            headerItem.addSubItem(ID_SEARCH, context.getString(R.string.Search), 0);
-        }
+        headerItem.addSubItem(ID_SEARCH, context.getString(R.string.Search), 0);

-        boolean isChatWithDeaddrop = m_mrChat.getId()==MrChat.MR_CHAT_ID_DEADDROP;
        m_canMute = true;
-        if( isChatWithDeaddrop && MrMailbox.getConfigInt("show_deaddrop", 0)==0 ) {
+        if( m_isChatWithDeaddrop /*&& !m_isDeaddropInChatlist*/ ) {
            m_canMute = false;
        }

@@ -593,13 +611,23 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
            muteMenuEntry = headerItem.addSubItem(ID_MUTE, null, 0);
        }

-        if( !isChatWithDeaddrop ) {
-            headerItem.addSubItem(ID_ATTACH, context.getString(R.string.AttachFiles), 0); // "Attach" means "Attach to chat", not "Attach to message" (which is not possible)
+        //if( !m_isChatWithDeaddrop ) {
+            //headerItem.addSubItem(ID_ATTACH, context.getString(R.string.AttachFiles), 0); // "Attach" means "Attach to chat", not "Attach to message" (which is not possible)
+        //}
+
+        if( !m_isChatWithDeaddrop ) {
+            headerItem.addSubItem(ID_SHOW_PROFILE, context.getString(R.string.ViewProfile), 0);
+            if( m_mrChat.getType()== MrChat.MR_CHAT_GROUP ) {
+                headerItem.addSubItem(ID_LEAVE_GROUP, context.getString(R.string.LeaveGroup), 0);
+            }
+            headerItem.addSubItem(ID_ARCHIVE_CHAT, context.getString(m_mrChat.getArchived()==0? R.string.ArchiveChat : R.string.UnarchiveChat), 0);
            headerItem.addSubItem(ID_DELETE_CHAT, context.getString(R.string.DeleteChat), 0);
        }

        updateTitle();
-        avatarContainer.updateSubtitle();
+        if( avatarContainer!=null ) {
+            avatarContainer.updateSubtitle();
+        }
        updateTitleIcons();

        menuItem = menu.addItem(ID_ATTACH, R.drawable.ic_ab_attach).setAllowCloseAnimation(false); // "menuItem" is added to ChatEnterViewActivity
@@ -629,11 +657,11 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not

                setMeasuredDimension(width, height);

-                actionModeTextView.setTextSize(!AndroidUtilities.isTablet() && getResources().getConfiguration().orientation == Configuration.ORIENTATION_LANDSCAPE ? 18 : 20);
+                actionModeTextView.setTextSize(getResources().getConfiguration().orientation == Configuration.ORIENTATION_LANDSCAPE ? 18 : 20);
                actionModeTextView.measure(MeasureSpec.makeMeasureSpec(width, MeasureSpec.AT_MOST), MeasureSpec.makeMeasureSpec(AndroidUtilities.dp(24), MeasureSpec.AT_MOST));

                if (actionModeSubTextView.getVisibility() != GONE) {
-                    actionModeSubTextView.setTextSize(!AndroidUtilities.isTablet() && getResources().getConfiguration().orientation == Configuration.ORIENTATION_LANDSCAPE ? 14 : 16);
+                    actionModeSubTextView.setTextSize(getResources().getConfiguration().orientation == Configuration.ORIENTATION_LANDSCAPE ? 14 : 16);
                    actionModeSubTextView.measure(MeasureSpec.makeMeasureSpec(width, MeasureSpec.AT_MOST), MeasureSpec.makeMeasureSpec(AndroidUtilities.dp(20), MeasureSpec.AT_MOST));
                }
            }
@@ -644,14 +672,14 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not

                int textTop;
                if (actionModeSubTextView.getVisibility() != GONE) {
-                    textTop = (height / 2 - actionModeTextView.getTextHeight()) / 2 + AndroidUtilities.dp(!AndroidUtilities.isTablet() && getResources().getConfiguration().orientation == Configuration.ORIENTATION_LANDSCAPE ? 2 : 3);
+                    textTop = (height / 2 - actionModeTextView.getTextHeight()) / 2 + AndroidUtilities.dp(getResources().getConfiguration().orientation == Configuration.ORIENTATION_LANDSCAPE ? 2 : 3);
                } else {
                    textTop = (height - actionModeTextView.getTextHeight()) / 2;
                }
                actionModeTextView.layout(0, textTop, actionModeTextView.getMeasuredWidth(), textTop + actionModeTextView.getTextHeight());

                if (actionModeSubTextView.getVisibility() != GONE) {
-                    textTop = height / 2 + (height / 2 - actionModeSubTextView.getTextHeight()) / 2 - AndroidUtilities.dp(!AndroidUtilities.isTablet() && getResources().getConfiguration().orientation == Configuration.ORIENTATION_LANDSCAPE ? 1 : 1);
+                    textTop = height / 2 + (height / 2 - actionModeSubTextView.getTextHeight()) / 2 - AndroidUtilities.dp(getResources().getConfiguration().orientation == Configuration.ORIENTATION_LANDSCAPE ? 1 : 1);
                    actionModeSubTextView.layout(0, textTop, actionModeSubTextView.getMeasuredWidth(), textTop + actionModeSubTextView.getTextHeight());
                }
            }
@@ -678,7 +706,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
        actionModeViews.add(actionMode.addItem(ID_DELETE_MESSAGES, R.drawable.ic_ab_fwd_delete, Theme.ACTION_BAR_MODE_SELECTOR_COLOR, null, AndroidUtilities.dp(54)));
        actionModeViews.add(actionMode.addItem(ID_FORWARD, R.drawable.ic_ab_fwd_forward, Theme.ACTION_BAR_MODE_SELECTOR_COLOR, null, AndroidUtilities.dp(54)));
        ActionBarMenuItem submenu = actionMode.addItem(0, R.drawable.ic_ab_other_grey);
-            if( isChatWithDeaddrop ) {
+            if( m_isChatWithDeaddrop ) {
                m_replyMenuItem = submenu.addSubItem(ID_REPLY, context.getString(R.string.Reply), 0);
            }
            submenu.addSubItem(ID_COPY, context.getString(R.string.CopyToClipboard), 0);
@@ -822,11 +850,11 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not

            TextView emptyView = new TextView(context);

-            if( m_mrChat.getParamInt(MrChat.MR_CHAT_PARAM_UNPROMOTED, 0)==1 ) {
+            if( m_mrChat.isUnpromoted() ) {
                emptyView.setText(context.getString(R.string.MsgNewGroupDraftHint));
                emptyView.setGravity(Gravity.START);
            }
-            else if( m_mrChat.getType()==MrChat.MR_CHAT_NORMAL ){
+            else if( m_mrChat.getType()==MrChat.MR_CHAT_NORMAL && !m_mrChat.isSelfTalk() ){
                String name = m_mrChat.getName();
                emptyView.setText(AndroidUtilities.replaceTags(String.format(context.getString(R.string.NoMessagesHint), name, name)));
                emptyView.setGravity(Gravity.START);
@@ -1039,8 +1067,6 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
        //noinspection ResourceType
        chatActivityEnterView.setId(ID_CHAT_COMPOSE_PANEL);

-        chatActivityEnterView.setAllowStickersAndGifs(false, false); // for the moment, we have no stickers
-
        contentView.addView(chatActivityEnterView, contentView.getChildCount() - 1, LayoutHelper.createFrame(LayoutHelper.MATCH_PARENT, LayoutHelper.WRAP_CONTENT, Gravity.START | Gravity.BOTTOM));
        chatActivityEnterView.setDelegate(new ChatActivityEnterView.ChatActivityEnterViewDelegate() {
            @Override
@@ -1061,10 +1087,6 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
            @Override
            public void onWindowSizeChanged(int size) {
            }
-
-            @Override
-            public void onStickersTab(boolean opened) {
-            }
        });

        bottomOverlay = new FrameLayout(context);
@@ -1106,8 +1128,6 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not

        updateBottomOverlay();

-        fixLayoutInternal();
-
        return fragmentView;
    }

@@ -1452,7 +1472,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not


        AlertDialog.Builder builder = new AlertDialog.Builder(getParentActivity());
-        builder.setPositiveButton(context.getString(R.string.OK), new DialogInterface.OnClickListener() {
+        builder.setPositiveButton(R.string.OK, new DialogInterface.OnClickListener() {
            @Override
            public void onClick(DialogInterface dialogInterface, int i) {
                int chatId = MrMailbox.createChatByContactId(fromId);
@@ -1466,7 +1486,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
                }
            }
        });
-        builder.setNegativeButton(context.getString(R.string.Cancel), null);
+        builder.setNegativeButton(R.string.Cancel, null);
        builder.setMessage(AndroidUtilities.replaceTags(String.format(context.getString(R.string.AskStartChatWith), name)));
        showDialog(builder.create());
    }
@@ -1630,16 +1650,15 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
    }

    private void updateTitleIcons() {
-        if (avatarContainer == null) {
-            return;
-        }
-
        int rightIcon = 0;
        if( m_canMute && MrMailbox.isDialogMuted(dialog_id) ) {
            rightIcon = R.drawable.mute_fixed;
        }

-        avatarContainer.setTitleIcons(0, rightIcon);
+        if (avatarContainer != null)  {
+            avatarContainer.setTitleIcons(0, rightIcon);
+        }
+
        if( muteMenuEntry != null ) {
            if (rightIcon != 0) {
                muteMenuEntry.setText(ApplicationLoader.applicationContext.getString(R.string.UnmuteNotifications));
@@ -1876,21 +1895,17 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not

                    if (markAsRead) {
                        if (paused) {
-                            readWhenResume = true;
+                            markseenWhenResume.put(evt_msg_id, 1);
                        } else {
-                            MrMailbox.markseenMsg(evt_msg_id);
+                            int msg_ids[] = new int[1];
+                            msg_ids[0] = evt_msg_id;
+                            MrMailbox.markseenMsgs(msg_ids);
                            NotificationsController.getInstance().removeSeenMessages();
                        }
                    }
                }
            }
        }
-        else if (id == NotificationCenter.emojiDidLoaded)
-        {
-            if (chatListView != null) {
-                chatListView.invalidateViews();
-            }
-        }
        else if (id == NotificationCenter.updateInterfaces)
        {
            int updateMask = (Integer) args[0];
@@ -2154,7 +2169,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
            chatActivityEnterView.setFieldFocused(false);
            chatActivityEnterView.setVisibility(View.INVISIBLE);
        } else {
-            if (m_mrChat.getId()==MrChat.MR_CHAT_ID_DEADDROP) {
+            if (m_isChatWithDeaddrop) {
                if( m_msglist.length==0 ) {
                    // showing the DeaddropHint if there are no messages is confusing (there are no "reply arrows" in this case)
                    bottomOverlayChatText.setText(ApplicationLoader.applicationContext.getString(R.string.NoMessages));
@@ -2214,9 +2229,15 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
            scrollToMessage = null;
        }
        paused = false;
-        if (readWhenResume ) {
-            readWhenResume = false;
-            MrMailbox.markseenChat((int)dialog_id);
+
+        int markseenWhenResumeCnt = markseenWhenResume.size();
+        if (markseenWhenResumeCnt>0 ) {
+            int msg_ids[] = new int[markseenWhenResumeCnt];
+            for(int i=0; i<markseenWhenResumeCnt; i++) {
+                msg_ids[i] = markseenWhenResume.keyAt(i);
+            }
+            MrMailbox.markseenMsgs(msg_ids);
+            markseenWhenResume.clear();
            NotificationsController.getInstance().removeSeenMessages();
        }

@@ -2298,24 +2319,6 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
        }
    }

-    private boolean fixLayoutInternal() {
-        /*if (!AndroidUtilities.isTablet() && ApplicationLoader.applicationContext.getResources().getConfiguration().orientation == Configuration.ORIENTATION_LANDSCAPE) {
-            selectedMessagesCountTextView.setTextSize(18);
-        } else {
-            selectedMessagesCountTextView.setTextSize(20);
-        }*/
-
-        if (AndroidUtilities.isTablet()) {
-            if (AndroidUtilities.isSmallTablet() && ApplicationLoader.applicationContext.getResources().getConfiguration().orientation == Configuration.ORIENTATION_PORTRAIT) {
-                actionBar.setBackButtonDrawable(new BackDrawable(false));
-            } else {
-                actionBar.setBackButtonDrawable(new BackDrawable(parentLayout == null || parentLayout.fragmentsStack.isEmpty() || parentLayout.fragmentsStack.get(0) == ChatActivity.this || parentLayout.fragmentsStack.size() == 1));
-            }
-            return false;
-        }
-        return true;
-    }
-
    private void fixLayout() {
        if (avatarContainer != null) {
            avatarContainer.getViewTreeObserver().addOnPreDrawListener(new ViewTreeObserver.OnPreDrawListener() {
@@ -2324,7 +2327,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
                    if (avatarContainer != null) {
                        avatarContainer.getViewTreeObserver().removeOnPreDrawListener(this);
                    }
-                    return fixLayoutInternal();
+                    return true;
                }
            });
        }
@@ -2338,7 +2341,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
    private void createDeleteMessagesAlert() {
        AlertDialog.Builder builder = new AlertDialog.Builder(getParentActivity());
        builder.setMessage(ApplicationLoader.applicationContext.getResources().getQuantityString(R.plurals.AreYouSureDeleteMessages, selectedMessagesIds.size(), selectedMessagesIds.size()));
-        builder.setPositiveButton(ApplicationLoader.applicationContext.getString(R.string.OK), new DialogInterface.OnClickListener() {
+        builder.setPositiveButton(R.string.OK, new DialogInterface.OnClickListener() {
            @Override
            public void onClick(DialogInterface dialogInterface, int i) {

@@ -2355,11 +2358,10 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
                actionBar.hideActionMode();
                updateVisibleRows();

-                MrMailbox.reloadMainChatlist();
                NotificationCenter.getInstance().postNotificationName(NotificationCenter.dialogsNeedReload);
            }
        });
-        builder.setNegativeButton(ApplicationLoader.applicationContext.getString(R.string.Cancel), null);
+        builder.setNegativeButton(R.string.Cancel, null);
        showDialog(builder.create());
    }

@@ -2421,7 +2423,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
    }

    @Override
-    public void didSelectDialog(DialogsActivity dialogsFragment, long fwd_chat_id, boolean param)
+    public void didSelectChat(ChatlistActivity dialogsFragment, long fwd_chat_id, boolean param)
    {
        if( selectedMessagesIds.size()>0) {
            int ids[] = new int[selectedMessagesIds.size()], i = 0;
@@ -2441,9 +2443,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
            args.putInt("chat_id", (int)fwd_chat_id);
            ChatActivity fragment = new ChatActivity(args);
            if( presentFragment(fragment, true /*remove last*/) ) {
-                if (!AndroidUtilities.isTablet()) {
-                    removeSelfFromStack();
-                }
+                removeSelfFromStack();
            }
            else {
                dialogsFragment.finishFragment(false);
@@ -2510,7 +2510,9 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
    }

    private void openSearchWithText(String text) {
-        avatarContainer.setVisibility(View.GONE);
+        if( avatarContainer!= null ) {
+            avatarContainer.setVisibility(View.GONE);
+        }
        headerItem.setVisibility(View.GONE);
        searchItem.setVisibility(View.VISIBLE);
        updateBottomOverlay();
@@ -2663,11 +2665,16 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
                            Bundle args = new Bundle();
                            args.putInt("user_id", user.id);
                            ProfileActivity fragment = new ProfileActivity(args);
-                            fragment.setPlayProfileAnimation(false);
                            presentFragment(fragment);
                        }
                    }

+                    @Override
+                    public void didPressedSetupMessage(ChatMessageCell cell) {
+                        //querySetupCode(cell.getMessageObject().getId(), null);
+                        Toast.makeText(getParentActivity(), ApplicationLoader.applicationContext.getString(R.string.NotYetImplemented), Toast.LENGTH_SHORT).show();
+                    }
+
                    @Override
                    public boolean canPerformActions() {
                        return actionBar != null && !actionBar.isActionModeShowed();
@@ -2730,13 +2737,13 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
                            if( isMailto )
                            {
                                AlertDialog.Builder builder = new AlertDialog.Builder(getParentActivity());
-                                builder.setPositiveButton(mContext.getString(R.string.OK), new DialogInterface.OnClickListener() {
+                                builder.setPositiveButton(R.string.OK, new DialogInterface.OnClickListener() {
                                    @Override
                                    public void onClick(DialogInterface dialogInterface, int i) {
-                                    createChat(urlFinal);
+                                        createChat(urlFinal);
                                    }
                                });
-                                builder.setNegativeButton(mContext.getString(R.string.Cancel), null);
+                                builder.setNegativeButton(R.string.Cancel, null);
                                builder.setMessage(AndroidUtilities.replaceTags(String.format(mContext.getString(R.string.AskStartChatWith), urlTitle)));
                                showDialog(builder.create());
                            }
@@ -2761,7 +2768,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
                    public void didPressedImage(ChatMessageCell cell) {
                        MessageObject message = cell.getMessageObject();

-                        if( message.type == MessageObject.MO_TYPE3_VIDEO && MrMailbox.getMsg(message.getId()).isIncreation()!=0 ) {
+                        if( message.type == MessageObject.MO_TYPE3_VIDEO && MrMailbox.getMsg(message.getId()).isIncreation() ) {
                            return; // we're not ready (still compressing), a hint is already shown in the message itself
                        }

@@ -2826,6 +2833,19 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
                    } else {
                        messageCell.setHighlightedText(null);
                    }
+
+                    // mark message as being read
+                    int state = mrMsg.getState();
+                    if( state == MrMsg.MR_IN_FRESH || state==MrMsg.MR_IN_NOTICED ) {
+                        if(paused) {
+                            markseenWhenResume.put(msg_id, 1);
+                        }
+                        else {
+                            int msg_ids[] = new int[1];
+                            msg_ids[0] = msg_id;
+                            MrMailbox.markseenMsgs(msg_ids);
+                        }
+                    }
                }
                else if( view instanceof ChatActionCell )
                {
@@ -2893,4 +2913,80 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
            }
        }
    }
+
+    void querySetupCode(final int msg_id, String[] preload)
+    {
+        if( !MrMailbox.getMsg(msg_id).isSetupMessage()) {
+            return;
+        }
+
+        View gl = View.inflate(getParentActivity(), R.layout.setup_code_grid, null);
+        final EditText[] editTexts = {
+                (EditText) gl.findViewById(R.id.setupCode0), (EditText) gl.findViewById(R.id.setupCode1), (EditText) gl.findViewById(R.id.setupCode2),
+                (EditText) gl.findViewById(R.id.setupCode3), (EditText) gl.findViewById(R.id.setupCode4), (EditText) gl.findViewById(R.id.setupCode5),
+                (EditText) gl.findViewById(R.id.setupCode6), (EditText) gl.findViewById(R.id.setupCode7), (EditText) gl.findViewById(R.id.setupCode8)
+        };
+        AlertDialog.Builder builder1 = new AlertDialog.Builder(getParentActivity());
+        builder1.setView(gl);
+        editTexts[0].setText(MrMailbox.getMsg(msg_id).getSetupCodeBegin());
+        editTexts[0].setSelection(editTexts[0].getText().length());
+
+        for( int i = 0; i < 9; i++ ) {
+            if( preload != null && i < preload.length ) {
+                editTexts[i].setText(preload[i]);
+                editTexts[i].setSelection(editTexts[i].getText().length());
+            }
+            editTexts[i].addTextChangedListener(new TextWatcher() {
+                @Override
+                public void beforeTextChanged(CharSequence s, int start, int count, int after) {
+                }
+
+                @Override
+                public void onTextChanged(CharSequence s, int start, int before, int count) {
+                    if( s.length()==4 ) {
+                        for ( int i = 0; i < 8; i++ ) {
+                            if( editTexts[i].hasFocus() && editTexts[i+1].getText().length()<4 ) {
+                                editTexts[i+1].requestFocus();
+                                break;
+                            }
+                        }
+                    }
+                }
+
+                @Override
+                public void afterTextChanged(Editable s) {
+                }
+            });
+        }
+
+        builder1.setTitle(ApplicationLoader.applicationContext.getString(R.string.AutocryptKeyTransfer));
+        builder1.setMessage(AndroidUtilities.replaceTags(ApplicationLoader.applicationContext.getString(R.string.AutocryptKeyTransferPleaseEnterCode)));
+        builder1.setNegativeButton(R.string.Cancel, null);
+        builder1.setCancelable(false); // prevent the dialog from being dismissed accidentally (when the dialog is closed, the setup code is gone forever and the user has to create a new setup message)
+        builder1.setPositiveButton(R.string.OK, new DialogInterface.OnClickListener() {
+            @Override
+            public void onClick(DialogInterface dialog, int which) {
+                String setup_code = "";
+                final String[] preload = new String[9];
+                for ( int i = 0; i < 9; i++ ) {
+                    preload[i] = editTexts[i].getText().toString();
+                    setup_code += preload[i];
+                }
+                boolean success = MrMailbox.continueKeyTransfer(msg_id, setup_code);
+
+                AlertDialog.Builder builder2 = new AlertDialog.Builder(getParentActivity());
+                builder2.setTitle(ApplicationLoader.applicationContext.getString(R.string.AutocryptKeyTransfer));
+                builder2.setMessage(AndroidUtilities.replaceTags(ApplicationLoader.applicationContext.getString(success? R.string.AutocryptKeyTransferSucceeded : R.string.AutocryptKeyTransferBadCode)));
+                builder2.setNegativeButton(R.string.Cancel, null);
+                builder2.setPositiveButton(R.string.Retry, new DialogInterface.OnClickListener() {
+                    @Override
+                    public void onClick(DialogInterface dialog, int which) {
+                        querySetupCode(msg_id, preload);
+                    }
+                });
+                showDialog(builder2.create());
+            }
+        });
+        showDialog(builder1.create());
+    }
 }
@@ -1,6 +1,6 @@
 /*******************************************************************************
 *
- *                          Messenger Android Frontend
+ *                              Delta Chat Android
 *                        (C) 2013-2016 Nikolai Kudashov
 *                           (C) 2017 Björn Petersen
 *                    Contact: r10s@b44t.com, http://b44t.com
@@ -21,7 +21,7 @@
 ******************************************************************************/


-package com.b44t.ui.Components;
+package com.b44t.messenger.Components;

 import android.graphics.Bitmap;
 import android.graphics.BitmapShader;
@@ -1,6 +1,6 @@
 /*******************************************************************************
 *
- *                          Messenger Android Frontend
+ *                              Delta Chat Android
 *                        (C) 2013-2016 Nikolai Kudashov
 *                           (C) 2017 Björn Petersen
 *                    Contact: r10s@b44t.com, http://b44t.com
@@ -21,7 +21,7 @@
 ******************************************************************************/


-package com.b44t.ui.Components;
+package com.b44t.messenger.Components;

 import android.graphics.Canvas;
 import android.graphics.ColorFilter;
@@ -29,38 +29,77 @@ import android.graphics.Paint;
 import android.graphics.PixelFormat;
 import android.graphics.Rect;
 import android.graphics.drawable.Drawable;
+import android.os.Build;
 import android.text.Layout;
 import android.text.StaticLayout;
 import android.text.TextPaint;

 import com.b44t.messenger.AndroidUtilities;

-public class LetterDrawable extends Drawable {
+public class AvatarDrawable extends Drawable {

-    public static Paint paint = new Paint();
+    private static Paint paint = new Paint(Paint.ANTI_ALIAS_FLAG);
    private static TextPaint namePaint;
+    private static int[] arrColors = {0xffe56555, 0xfff28c48, 0xff8e85ee, 0xff76c84d, 0xff5bb6cc, 0xff549cdd, 0xffd25c99, 0xffb37800}; /* the colors should contrast to typical action bar colors as well as to white (more important, is used as text color)*/

+    private int color;
    private StaticLayout textLayout;
    private float textWidth;
    private float textHeight;
    private float textLeft;
    private StringBuilder stringBuilder = new StringBuilder(5);

-    public LetterDrawable() {
+    public AvatarDrawable() {
        super();

        if (namePaint == null) {
-            paint.setColor(0xfff0f0f0);
            namePaint = new TextPaint(Paint.ANTI_ALIAS_FLAG);
            namePaint.setColor(0xffffffff);
-            namePaint.setTextSize(AndroidUtilities.dp(28));
+            namePaint.setTextSize(AndroidUtilities.dp(20));
        }
    }

-    public void setTitle(String title) {
+    private static int getColorIndex(int id) {
+        return Math.abs(id % arrColors.length);
+    }
+
+    public static int getNameColor(String name) {
+        int id = strChecksum(name);
+        return arrColors[getColorIndex(id)];
+    }
+
+    private static int strChecksum(String str) {
+        int ret = 0;
+        if( str!=null ) {
+            int i;
+            for (i = 0; i < str.length(); i++) {
+                ret += (i+1)*str.charAt(i);
+                ret %= 0x00FFFFFF;
+            }
+        }
+        return ret;
+    }
+
+    public void setInfoByName(String name) {
+        int id = strChecksum(name);
+
+        color = arrColors[getColorIndex(id)];
+
        stringBuilder.setLength(0);
-        if (title != null && title.length() > 0) {
-            stringBuilder.append(title.substring(0, 1));
+        if (name != null && name.length() > 0) {
+            stringBuilder.appendCodePoint(name.codePointAt(0));
+
+            for (int a = name.length() - 1; a >= 0; a--) {
+                if (name.charAt(a) == ' ') {
+                    if (a != name.length() - 1 && name.charAt(a + 1) != ' ') {
+                        if (Build.VERSION.SDK_INT >= 16) {
+                            stringBuilder.append("\u200C"); // ZERO WIDTH NON-JOINER - avoids the two letter to melt into a ligature which would be incorrect on the initials
+                        }
+                        stringBuilder.appendCodePoint(name.codePointAt(a + 1));
+                        break;
+                    }
+                }
+            }
        }

        if (stringBuilder.length() > 0) {
@@ -87,23 +126,25 @@ public class LetterDrawable extends Drawable {
            return;
        }
        int size = bounds.width();
+        paint.setColor(color);
        canvas.save();
-        canvas.drawRect(bounds.left, bounds.top, bounds.right, bounds.bottom, paint);
+        canvas.translate(bounds.left, bounds.top);
+        canvas.drawCircle(size / 2, size / 2, size / 2, paint);
+
        if (textLayout != null) {
-            canvas.translate(bounds.left + (size - textWidth) / 2 - textLeft, bounds.top + (size - textHeight) / 2);
+            canvas.translate((size - textWidth) / 2 - textLeft, (size - textHeight) / 2);
            textLayout.draw(canvas);
        }
+
        canvas.restore();
    }

    @Override
-    public void setAlpha(int alpha) {
-
+    public void setAlpha(int alpha) { // must be present in non-abstract classes derived from Drawable
    }

    @Override
-    public void setColorFilter(ColorFilter cf) {
-
+    public void setColorFilter(ColorFilter cf) { // must be present in non-abstract classes derived from Drawable
    }

    @Override
@@ -1,6 +1,6 @@
 /*******************************************************************************
 *
- *                          Messenger Android Frontend
+ *                              Delta Chat Android
 *                        (C) 2013-2016 Nikolai Kudashov
 *                           (C) 2017 Björn Petersen
 *                    Contact: r10s@b44t.com, http://b44t.com
@@ -21,7 +21,7 @@
 ******************************************************************************/


-package com.b44t.ui.Components;
+package com.b44t.messenger.Components;

 import android.Manifest;
 import android.app.Activity;
@@ -40,11 +40,11 @@ import com.b44t.messenger.MediaController;
 import com.b44t.messenger.TLRPC;
 import com.b44t.messenger.FileLoader;
 import com.b44t.messenger.UserConfig;
-import com.b44t.ui.LaunchActivity;
-import com.b44t.ui.PhotoAlbumPickerActivity;
-import com.b44t.ui.PhotoCropActivity;
-import com.b44t.ui.ActionBar.BaseFragment;
-import com.b44t.ui.PhotoViewer;
+import com.b44t.messenger.LaunchActivity;
+import com.b44t.messenger.PhotoAlbumPickerActivity;
+import com.b44t.messenger.PhotoCropActivity;
+import com.b44t.messenger.ActionBar.BaseFragment;
+import com.b44t.messenger.PhotoViewer;

 import java.io.File;
 import java.util.ArrayList;
@@ -1,6 +1,6 @@
 /*******************************************************************************
 *
- *                          Messenger Android Frontend
+ *                              Delta Chat Android
 *                        (C) 2013-2016 Nikolai Kudashov
 *                           (C) 2017 Björn Petersen
 *                    Contact: r10s@b44t.com, http://b44t.com
@@ -21,7 +21,7 @@
 ******************************************************************************/


-package com.b44t.ui.Components;
+package com.b44t.messenger.Components;

 import android.content.Context;
 import android.graphics.Bitmap;
@@ -1,6 +1,6 @@
 /*******************************************************************************
 *
- *                          Messenger Android Frontend
+ *                              Delta Chat Android
 *                        (C) 2013-2016 Nikolai Kudashov
 *                           (C) 2017 Björn Petersen
 *                    Contact: r10s@b44t.com, http://b44t.com
@@ -21,7 +21,7 @@
 ******************************************************************************/


-package com.b44t.ui.Adapters;
+package com.b44t.messenger.Components;

 import android.database.DataSetObserver;
 import android.view.View;
@@ -1,6 +1,6 @@
 /*******************************************************************************
 *
- *                          Messenger Android Frontend
+ *                              Delta Chat Android
 *                        (C) 2013-2016 Nikolai Kudashov
 *                           (C) 2017 Björn Petersen
 *                    Contact: r10s@b44t.com, http://b44t.com
@@ -21,14 +21,14 @@
 ******************************************************************************/


-package com.b44t.messenger.browser;
+package com.b44t.messenger.Components;

 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;

-import com.b44t.ui.LaunchActivity;
+import com.b44t.messenger.LaunchActivity;

 public class Browser {

@@ -1,6 +1,6 @@
 /*******************************************************************************
 *
- *                          Messenger Android Frontend
+ *                              Delta Chat Android
 *                        (C) 2013-2016 Nikolai Kudashov
 *                           (C) 2017 Björn Petersen
 *                    Contact: r10s@b44t.com, http://b44t.com
@@ -21,7 +21,7 @@
 ******************************************************************************/


-package com.b44t.ui.Components;
+package com.b44t.messenger.Components;

 import android.Manifest;
 import android.animation.Animator;
@@ -40,7 +40,6 @@ import android.graphics.drawable.Drawable;
 import android.media.AudioManager;
 import android.os.Build;
 import android.os.PowerManager;
-import android.os.SystemClock;
 import android.text.Editable;
 import android.text.SpannableStringBuilder;
 import android.text.TextWatcher;
@@ -61,7 +60,7 @@ import android.widget.LinearLayout;
 import android.widget.TextView;

 import com.b44t.messenger.AndroidUtilities;
-import com.b44t.messenger.Emoji;
+import com.b44t.messenger.EmojiInputView;
 import com.b44t.messenger.MediaController;
 import com.b44t.messenger.MessageObject;
 import com.b44t.messenger.MrContact;
@@ -72,11 +71,10 @@ import com.b44t.messenger.R;
 import com.b44t.messenger.TLRPC;
 import com.b44t.messenger.AnimatorListenerAdapterProxy;
 import com.b44t.messenger.ApplicationLoader;
-import com.b44t.ui.ActionBar.Theme;
-import com.b44t.ui.ChatActivity;
+import com.b44t.messenger.ActionBar.Theme;
+import com.b44t.messenger.ChatActivity;

 import java.io.File;
-import java.lang.reflect.Field;
 import java.util.ArrayList;

 public class ChatActivityEnterView extends FrameLayout implements NotificationCenter.NotificationCenterDelegate, SizeNotifierFrameLayout.SizeNotifierFrameLayoutDelegate /*, StickersAlert.StickersAlertDelegate*/ {
@@ -86,7 +84,6 @@ public class ChatActivityEnterView extends FrameLayout implements NotificationCe
        void needSendTyping();
        void onTextChanged(CharSequence text, boolean bigChange);
        void onWindowSizeChanged(int size);
-        void onStickersTab(boolean opened);
    }

    private class SeekBarWaveformView extends View {
@@ -149,26 +146,26 @@ public class ChatActivityEnterView extends FrameLayout implements NotificationCe

    private class EditTextCaption extends EditText {

-        private Object editor;
-        private Field editorField;
-        private Drawable[] mCursorDrawable;
-        private Field mCursorDrawableField;
+        //private Object editor;
+        //private Field editorField;
+        //private Drawable[] mCursorDrawable;
+        //private Field mCursorDrawableField;

        public EditTextCaption(Context context) {
            super(context);

-            try {
-                Field field = TextView.class.getDeclaredField("mEditor");
-                field.setAccessible(true);
-                editor = field.get(this);
-                Class editorClass = Class.forName("android.widget.Editor");
-                editorField = editorClass.getDeclaredField("mShowCursor");
-                editorField.setAccessible(true);
-                mCursorDrawableField = editorClass.getDeclaredField("mCursorDrawable");
-                mCursorDrawableField.setAccessible(true);
-                mCursorDrawable = (Drawable[]) mCursorDrawableField.get(editor);
-            } catch (Throwable e) {
-            }
+            //try {
+                //Field field = TextView.class.getDeclaredField("mEditor");
+                //field.setAccessible(true);
+                //editor = field.get(this);
+                //Class editorClass = Class.forName("android.widget.Editor");
+                //editorField = editorClass.getDeclaredField("mShowCursor");
+                //editorField.setAccessible(true);
+                //mCursorDrawableField = editorClass.getDeclaredField("mCursorDrawable");
+                //mCursorDrawableField.setAccessible(true);
+                //mCursorDrawable = (Drawable[]) mCursorDrawableField.get(editor);
+            //} catch (Throwable e) {
+            //}
        }

        @SuppressLint("DrawAllocation")
@@ -189,10 +186,10 @@ public class ChatActivityEnterView extends FrameLayout implements NotificationCe
            } catch (Exception e) {
            }

-            try {
+            //try {
                // the following lines are because otherwise the cursor stops blinking if
                // the focus was set to another text field in between (eg. search)
-                if (editorField != null && mCursorDrawable != null && mCursorDrawable[0] != null) {
+                /*if (editorField != null && mCursorDrawable != null && mCursorDrawable[0] != null) {
                    long mShowCursor = editorField.getLong(editor);
                    boolean showCursor = (SystemClock.uptimeMillis() - mShowCursor) % (2 * 500) < 500;
                    if (showCursor) {
@@ -201,9 +198,9 @@ public class ChatActivityEnterView extends FrameLayout implements NotificationCe
                        mCursorDrawable[0].draw(canvas);
                        canvas.restore();
                    }
-                }
-            } catch (Throwable e) {
-            }
+                }*/
+            //} catch (Throwable e) {
+            //}
        }

        @Override
@@ -225,7 +222,7 @@ public class ChatActivityEnterView extends FrameLayout implements NotificationCe
    private EditTextCaption messageEditText;
    private ImageView sendButton;
    private ImageView emojiButton;
-    private EmojiView emojiView;
+    private EmojiInputView emojiView;
    private TextView recordTimeText;
    private ImageView audioRecordButton;
    private FrameLayout recordPanel;
@@ -424,7 +421,6 @@ public class ChatActivityEnterView extends FrameLayout implements NotificationCe
        NotificationCenter.getInstance().addObserver(this, NotificationCenter.recordProgressChanged);
        NotificationCenter.getInstance().addObserver(this, NotificationCenter.closeChats);
        NotificationCenter.getInstance().addObserver(this, NotificationCenter.audioDidSent);
-        NotificationCenter.getInstance().addObserver(this, NotificationCenter.emojiDidLoaded);
        NotificationCenter.getInstance().addObserver(this, NotificationCenter.audioRouteChanged);
        NotificationCenter.getInstance().addObserver(this, NotificationCenter.audioDidReset);
        NotificationCenter.getInstance().addObserver(this, NotificationCenter.audioProgressDidChanged);
@@ -570,18 +566,11 @@ public class ChatActivityEnterView extends FrameLayout implements NotificationCe
                    for (int i = 0; i < spans.length; i++) {
                        editable.removeSpan(spans[i]);
                    }
-                    Emoji.replaceEmoji(editable, messageEditText.getPaint().getFontMetricsInt(), AndroidUtilities.dp(20), false);
+                    EmojiInputView.replaceEmoji(editable, false);
                    processChange = false;
                }
            }
        });
-        try {
-            Field mCursorDrawableRes = TextView.class.getDeclaredField("mCursorDrawableRes");
-            mCursorDrawableRes.setAccessible(true);
-            mCursorDrawableRes.set(messageEditText, R.drawable.field_carret);
-        } catch (Exception e) {
-            //nothing to do
-        }

        if (isChat) {
            attachButton = new LinearLayout(context);
@@ -601,7 +590,7 @@ public class ChatActivityEnterView extends FrameLayout implements NotificationCe

        ImageView imageView = new ImageView(context);
        imageView.setScaleType(ImageView.ScaleType.CENTER);
-        imageView.setImageResource(R.drawable.delete_reply);
+        imageView.setImageResource(R.drawable.dismiss_recording);
        recordedAudioPanel.addView(imageView, LayoutHelper.createFrame(48, 48));
        imageView.setOnClickListener(new OnClickListener() {
            @Override
@@ -806,24 +795,6 @@ public class ChatActivityEnterView extends FrameLayout implements NotificationCe
        return false;
    }

-    public void setAllowStickersAndGifs(boolean value, boolean value2) {
-        if ((allowStickers != value || allowGifs != value2) && emojiView != null) {
-            if (emojiView.getVisibility() == VISIBLE) {
-                hidePopup(false);
-            }
-            sizeNotifierLayout.removeView(emojiView);
-            emojiView = null;
-        }
-        allowStickers = value;
-        allowGifs = value2;
-    }
-
-    public void setOpenGifsTabFirst() {
-        createEmojiView();
-        emojiView.loadGifRecent();
-        emojiView.switchToGifRecent();
-    }
-
    public boolean isTopViewVisible() {
        return false;
    }
@@ -845,13 +816,9 @@ public class ChatActivityEnterView extends FrameLayout implements NotificationCe
        NotificationCenter.getInstance().removeObserver(this, NotificationCenter.recordProgressChanged);
        NotificationCenter.getInstance().removeObserver(this, NotificationCenter.closeChats);
        NotificationCenter.getInstance().removeObserver(this, NotificationCenter.audioDidSent);
-        NotificationCenter.getInstance().removeObserver(this, NotificationCenter.emojiDidLoaded);
        NotificationCenter.getInstance().removeObserver(this, NotificationCenter.audioRouteChanged);
        NotificationCenter.getInstance().removeObserver(this, NotificationCenter.audioDidReset);
        NotificationCenter.getInstance().removeObserver(this, NotificationCenter.audioProgressDidChanged);
-        if (emojiView != null) {
-            emojiView.onDestroy();
-        }
        if (mWakeLock != null) {
            try {
                mWakeLock.release();
@@ -1338,9 +1305,9 @@ public class ChatActivityEnterView extends FrameLayout implements NotificationCe
        if (emojiView != null) {
            return;
        }
-        emojiView = new EmojiView(allowStickers, allowGifs, parentActivity);
+        emojiView = new EmojiInputView(parentActivity);
        emojiView.setVisibility(GONE);
-        emojiView.setListener(new EmojiView.Listener() {
+        emojiView.setListener(new EmojiInputView.Listener() {
            public boolean onBackspace() {
                if (messageEditText.length() == 0) {
                    return false;
@@ -1356,7 +1323,7 @@ public class ChatActivityEnterView extends FrameLayout implements NotificationCe
                }
                try {
                    innerTextChange = 2;
-                    CharSequence localCharSequence = Emoji.replaceEmoji(symbol, messageEditText.getPaint().getFontMetricsInt(), AndroidUtilities.dp(20), false);
+                    CharSequence localCharSequence = EmojiInputView.replaceEmoji(symbol, false);
                    messageEditText.setText(messageEditText.getText().insert(i, localCharSequence));
                    int j = i + localCharSequence.length();
                    messageEditText.setSelection(j, j);
@@ -1367,47 +1334,6 @@ public class ChatActivityEnterView extends FrameLayout implements NotificationCe
                }
            }

-            /*public void onStickerSelected(TLRPC.Document sticker) {
-                ChatActivityEnterView.this.onStickerSelected(sticker);
-            }*/
-
-            @Override
-            public void onStickersSettingsClick() {
-                if (parentFragment != null) {
-                    //parentFragment.presentFragment(new StickersActivity()); -- EDIT BY MR
-                }
-            }
-
-            @Override
-            public void onGifSelected(TLRPC.Document gif) {
-                SendMessagesHelper.getInstance().sendSticker(gif, dialog_id);
-                if ((int) dialog_id == 0) {
-                    //MessagesController.getInstance().saveGif(gif);
-                }
-                if (delegate != null) {
-                    delegate.onMessageSend(null);
-                }
-            }
-
-            @Override
-            public void onGifTab(boolean opened) {
-                if (!AndroidUtilities.usingHardwareInput) {
-                    if (opened) {
-                        if (messageEditText.length() == 0) {
-                            messageEditText.setText("@gif ");
-                            messageEditText.setSelection(messageEditText.length());
-                        }
-                    } else if (messageEditText.getText().toString().equals("@gif ")) {
-                        messageEditText.setText("");
-                    }
-                }
-            }
-
-            @Override
-            public void onStickersTab(boolean opened) {
-                delegate.onStickersTab(opened);
-            }
-
            @Override
            public void onClearEmojiRecent() {
                if (parentFragment == null || parentActivity == null) {
@@ -1415,13 +1341,13 @@ public class ChatActivityEnterView extends FrameLayout implements NotificationCe
                }
                AlertDialog.Builder builder = new AlertDialog.Builder(parentActivity);
                builder.setMessage(ApplicationLoader.applicationContext.getString(R.string.ClearRecentEmoji));
-                builder.setPositiveButton(ApplicationLoader.applicationContext.getString(R.string.ClearButton).toUpperCase(), new DialogInterface.OnClickListener() {
+                builder.setPositiveButton(R.string.ClearButton, new DialogInterface.OnClickListener() {
                    @Override
                    public void onClick(DialogInterface dialogInterface, int i) {
-                        emojiView.clearRecentEmoji();
+                        emojiView.clearRecent();
                    }
                });
-                builder.setNegativeButton(ApplicationLoader.applicationContext.getString(R.string.Cancel), null);
+                builder.setNegativeButton(R.string.Cancel, null);
                parentFragment.showDialog(builder.create());
            }
        });
@@ -1429,14 +1355,6 @@ public class ChatActivityEnterView extends FrameLayout implements NotificationCe
        sizeNotifierLayout.addView(emojiView);
    }

-    /*@Override
-    public void onStickerSelected(TLRPC.Document sticker) {
-        SendMessagesHelper.getInstance().sendSticker(sticker, dialog_id);
-        if (delegate != null) {
-            delegate.onMessageSend(null);
-        }
-    }*/
-
    private void showPopup(int show, int contentType /*0=emojiView, 1=botKeyboardView*/ ) {
        if (show == 1) {
            if (contentType == 0 && emojiView == null) {
@@ -1538,17 +1456,6 @@ public class ChatActivityEnterView extends FrameLayout implements NotificationCe
        return emojiView != null && emojiView.getVisibility() == VISIBLE;
    }

-    public boolean isKeyboardVisible() {
-        return keyboardVisible;
-    }
-
-    public void addRecentGif(MediaController.SearchImage searchImage) {
-        if (emojiView == null) {
-            return;
-        }
-        emojiView.addRecentGif(searchImage);
-    }
-
    @Override
    public void onSizeChanged(int height, boolean isWidthGreater) {
        if (height > AndroidUtilities.dp(50) && keyboardVisible) {
@@ -1619,11 +1526,7 @@ public class ChatActivityEnterView extends FrameLayout implements NotificationCe

    @Override
    public void didReceivedNotification(int id, Object... args) {
-        if (id == NotificationCenter.emojiDidLoaded) {
-            if (emojiView != null) {
-                emojiView.invalidateViews();
-            }
-        } else if (id == NotificationCenter.recordProgressChanged) {
+        if (id == NotificationCenter.recordProgressChanged) {
            long t = (Long) args[0];
            Long time = t / 1000;
            int ms = (int) (t % 1000L) / 10;
@@ -1,6 +1,6 @@
 /*******************************************************************************
 *
- *                          Messenger Android Frontend
+ *                              Delta Chat Android
 *                        (C) 2013-2016 Nikolai Kudashov
 *                           (C) 2017 Björn Petersen
 *                    Contact: r10s@b44t.com, http://b44t.com
@@ -21,7 +21,7 @@
 ******************************************************************************/


-package com.b44t.ui.Components;
+package com.b44t.messenger.Components;

 import android.Manifest;
 import android.animation.Animator;
@@ -49,19 +49,18 @@ import android.widget.TextView;

 import com.b44t.messenger.AndroidUtilities;
 import com.b44t.messenger.ApplicationLoader;
-import com.b44t.messenger.LocaleController;
 import com.b44t.messenger.MediaController;
 import com.b44t.messenger.MessageObject;
 import com.b44t.messenger.NotificationCenter;
-import com.b44t.messenger.support.widget.LinearLayoutManager;
+import com.b44t.messenger.aosp.LinearLayoutManager;
 import com.b44t.messenger.R;
-import com.b44t.messenger.support.widget.RecyclerView;
+import com.b44t.messenger.aosp.RecyclerView;
 import com.b44t.messenger.TLRPC;
-import com.b44t.ui.ActionBar.BottomSheet;
-import com.b44t.ui.ActionBar.Theme;
-import com.b44t.ui.Cells.PhotoAttachPhotoCell;
-import com.b44t.ui.ChatActivity;
-import com.b44t.ui.PhotoViewer;
+import com.b44t.messenger.ActionBar.BottomSheet;
+import com.b44t.messenger.ActionBar.Theme;
+import com.b44t.messenger.Cells.PhotoAttachPhotoCell;
+import com.b44t.messenger.ChatActivity;
+import com.b44t.messenger.PhotoViewer;

 import java.util.ArrayList;
 import java.util.HashMap;
@@ -757,7 +756,7 @@ public class ChatAttachAlert extends BottomSheet implements NotificationCenter.N
    }

    private void setUseRevealAnimation(boolean value) {
-        if (!value || value && Build.VERSION.SDK_INT >= 18 && !AndroidUtilities.isTablet()) {
+        if (!value || value && Build.VERSION.SDK_INT >= 18) {
            useRevealAnimation = value;
        }
    }
@@ -1,6 +1,6 @@
 /*******************************************************************************
 *
- *                          Messenger Android Frontend
+ *                              Delta Chat Android
 *                        (C) 2013-2016 Nikolai Kudashov
 *                           (C) 2017 Björn Petersen
 *                    Contact: r10s@b44t.com, http://b44t.com
@@ -21,10 +21,9 @@
 ******************************************************************************/


-package com.b44t.ui.Components;
+package com.b44t.messenger.Components;

 import android.content.Context;
-import android.graphics.Typeface;
 import android.os.Build;
 import android.os.Bundle;
 import android.view.Gravity;
@@ -35,12 +34,11 @@ import com.b44t.messenger.AndroidUtilities;
 import com.b44t.messenger.ContactsController;
 import com.b44t.messenger.MrChat;
 import com.b44t.messenger.MrMailbox;
-import com.b44t.messenger.TLRPC;
-import com.b44t.ui.ActionBar.ActionBar;
-import com.b44t.ui.ActionBar.SimpleTextView;
-import com.b44t.ui.ActionBar.Theme;
-import com.b44t.ui.ChatActivity;
-import com.b44t.ui.ProfileActivity;
+import com.b44t.messenger.ActionBar.ActionBar;
+import com.b44t.messenger.ActionBar.SimpleTextView;
+import com.b44t.messenger.ActionBar.Theme;
+import com.b44t.messenger.ChatActivity;
+import com.b44t.messenger.ProfileActivity;

 public class ChatAvatarContainer extends FrameLayout {

@@ -88,7 +86,6 @@ public class ChatAvatarContainer extends FrameLayout {
                }

                ProfileActivity fragment = new ProfileActivity(args);
-                fragment.setPlayProfileAnimation(true);
                parentFragment.presentFragment(fragment);
            }
        });
@@ -1,6 +1,6 @@
 /*******************************************************************************
 *
- *                          Messenger Android Frontend
+ *                              Delta Chat Android
 *                        (C) 2013-2016 Nikolai Kudashov
 *                           (C) 2017 Björn Petersen
 *                    Contact: r10s@b44t.com, http://b44t.com
@@ -21,7 +21,7 @@
 ******************************************************************************/


-package com.b44t.ui.Components;
+package com.b44t.messenger.Components;

 import android.animation.ObjectAnimator;
 import android.content.Context;
@@ -1,6 +1,6 @@
 /*******************************************************************************
 *
- *                          Messenger Android Frontend
+ *                              Delta Chat Android
 *                        (C) 2013-2016 Nikolai Kudashov
 *                           (C) 2017 Björn Petersen
 *                    Contact: r10s@b44t.com, http://b44t.com
@@ -21,7 +21,7 @@
 ******************************************************************************/


-package com.b44t.ui.Components;
+package com.b44t.messenger.Components;

 import android.graphics.Paint;
 import android.graphics.drawable.Drawable;
@@ -1,6 +1,6 @@
 /*******************************************************************************
 *
- *                          Messenger Android Frontend
+ *                              Delta Chat Android
 *                        (C) 2013-2016 Nikolai Kudashov
 *                           (C) 2017 Björn Petersen
 *                    Contact: r10s@b44t.com, http://b44t.com
@@ -21,7 +21,7 @@
 ******************************************************************************/


-package com.b44t.ui.Components;
+package com.b44t.messenger.Components;

 import android.content.Context;
 import android.graphics.Bitmap;
@@ -14,7 +14,7 @@
 * limitations under the License.
 */

-package com.b44t.ui.Components;
+package com.b44t.messenger.Components;

 import android.content.Context;
 import android.graphics.Canvas;
@@ -1,6 +1,6 @@
 /*******************************************************************************
 *
- *                          Messenger Android Frontend
+ *                              Delta Chat Android
 *                        (C) 2013-2016 Nikolai Kudashov
 *                           (C) 2017 Björn Petersen
 *                    Contact: r10s@b44t.com, http://b44t.com
@@ -20,7 +20,7 @@
 *
 ******************************************************************************/

-package com.b44t.ui.Components;
+package com.b44t.messenger.Components;

 import android.content.Context;
 import android.util.TypedValue;
@@ -32,7 +32,6 @@ import android.widget.ProgressBar;
 import android.widget.TextView;

 import com.b44t.messenger.AndroidUtilities;
-import com.b44t.messenger.LocaleController;
 import com.b44t.messenger.R;

 public class EmptyTextProgressView extends FrameLayout {
@@ -1,6 +1,6 @@
 /*******************************************************************************
 *
- *                          Messenger Android Frontend
+ *                              Delta Chat Android
 *                        (C) 2013-2016 Nikolai Kudashov
 *                           (C) 2017 Björn Petersen
 *                    Contact: r10s@b44t.com, http://b44t.com
@@ -21,7 +21,7 @@
 ******************************************************************************/


-package com.b44t.ui.Components;
+package com.b44t.messenger.Components;

 import android.annotation.SuppressLint;
 import android.app.Activity;
@@ -1,6 +1,6 @@
 /*******************************************************************************
 *
- *                          Messenger Android Frontend
+ *                              Delta Chat Android
 *                        (C) 2013-2016 Nikolai Kudashov
 *                           (C) 2017 Björn Petersen
 *                    Contact: r10s@b44t.com, http://b44t.com
@@ -21,7 +21,7 @@
 ******************************************************************************/


-package com.b44t.ui.Components;
+package com.b44t.messenger.Components;

 import android.widget.FrameLayout;
 import android.widget.LinearLayout;
@@ -1,6 +1,6 @@
 /*******************************************************************************
 *
- *                          Messenger Android Frontend
+ *                              Delta Chat Android
 *                        (C) 2013-2016 Nikolai Kudashov
 *                           (C) 2017 Björn Petersen
 *                    Contact: r10s@b44t.com, http://b44t.com
@@ -21,7 +21,7 @@
 ******************************************************************************/


-package com.b44t.ui.Components;
+package com.b44t.messenger.Components;

 import android.graphics.Path;
 import android.text.StaticLayout;
@@ -1,6 +1,6 @@
 /*******************************************************************************
 *
- *                          Messenger Android Frontend
+ *                              Delta Chat Android
 *                        (C) 2013-2016 Nikolai Kudashov
 *                           (C) 2017 Björn Petersen
 *                    Contact: r10s@b44t.com, http://b44t.com
@@ -21,7 +21,7 @@
 ******************************************************************************/


-package com.b44t.ui.Components;
+package com.b44t.messenger.Components;

 import android.animation.Animator;
 import android.animation.ObjectAnimator;
@@ -1,6 +1,6 @@
 /*******************************************************************************
 *
- *                          Messenger Android Frontend
+ *                              Delta Chat Android
 *                        (C) 2013-2016 Nikolai Kudashov
 *                           (C) 2017 Björn Petersen
 *                    Contact: r10s@b44t.com, http://b44t.com
@@ -21,7 +21,7 @@
 ******************************************************************************/


-package com.b44t.ui.Components;
+package com.b44t.messenger.Components;

 import android.content.Context;
 import android.graphics.Canvas;
@@ -1,6 +1,6 @@
 /*******************************************************************************
 *
- *                          Messenger Android Frontend
+ *                              Delta Chat Android
 *                        (C) 2013-2016 Nikolai Kudashov
 *                           (C) 2017 Björn Petersen
 *                    Contact: r10s@b44t.com, http://b44t.com
@@ -21,7 +21,7 @@
 ******************************************************************************/


-package com.b44t.ui.Components;
+package com.b44t.messenger.Components;

 import android.animation.Animator;
 import android.animation.AnimatorSet;
@@ -61,13 +61,12 @@ import android.widget.RelativeLayout;
 import android.widget.TextView;

 import com.b44t.messenger.AndroidUtilities;
-import com.b44t.messenger.LocaleController;
 import com.b44t.messenger.NotificationCenter;
 import com.b44t.messenger.ApplicationLoader;
 import com.b44t.messenger.R;
 import com.b44t.messenger.UserConfig;
 import com.b44t.messenger.AnimatorListenerAdapterProxy;
-import com.b44t.ui.ActionBar.Theme;
+import com.b44t.messenger.ActionBar.Theme;

 import java.util.ArrayList;
 import java.util.Locale;
@@ -159,7 +158,6 @@ public class PasscodeView extends FrameLayout {
        passwordEditText.setImeOptions(EditorInfo.IME_ACTION_DONE);
        passwordEditText.setTypeface(Typeface.DEFAULT);
        passwordEditText.setBackgroundDrawable(null);
-        AndroidUtilities.clearCursorDrawable(passwordEditText);
        passwordFrameLayout.addView(passwordEditText);
        layoutParams = (FrameLayout.LayoutParams) passwordEditText.getLayoutParams();
        layoutParams.height = LayoutHelper.WRAP_CONTENT;
@@ -531,7 +529,7 @@ public class PasscodeView extends FrameLayout {

                    AlertDialog.Builder builder = new AlertDialog.Builder(getContext());
                    builder.setView(relativeLayout);
-                    builder.setNegativeButton(ApplicationLoader.applicationContext.getString(R.string.Cancel), null);
+                    builder.setNegativeButton(R.string.Cancel, null);
                    builder.setOnDismissListener(new DialogInterface.OnDismissListener() {
                        @Override
                        public void onDismiss(DialogInterface dialog) {
@@ -666,7 +664,7 @@ public class PasscodeView extends FrameLayout {

        LayoutParams layoutParams;

-        if (!AndroidUtilities.isTablet() && getContext().getResources().getConfiguration().orientation == Configuration.ORIENTATION_LANDSCAPE) {
+        if (getContext().getResources().getConfiguration().orientation == Configuration.ORIENTATION_LANDSCAPE) {
            layoutParams = (LayoutParams) passwordFrameLayout.getLayoutParams();
            layoutParams.width = UserConfig.passcodeType == 0 ? width / 2 : width;
            layoutParams.height = AndroidUtilities.dp(140);
@@ -682,16 +680,6 @@ public class PasscodeView extends FrameLayout {
        } else {
            int top = 0;
            int left = 0;
-            if (AndroidUtilities.isTablet()) {
-                if (width > AndroidUtilities.dp(498)) {
-                    left = (width - AndroidUtilities.dp(498)) / 2;
-                    width = AndroidUtilities.dp(498);
-                }
-                if (height > AndroidUtilities.dp(528)) {
-                    top = (height - AndroidUtilities.dp(528)) / 2;
-                    height = AndroidUtilities.dp(528);
-                }
-            }
            layoutParams = (LayoutParams) passwordFrameLayout.getLayoutParams();
            layoutParams.height = height / 3;
            layoutParams.width = width;
@@ -759,7 +747,7 @@ public class PasscodeView extends FrameLayout {
        getWindowVisibleDisplayFrame(rect);
        keyboardHeight = usableViewHeight - (rect.bottom - rect.top);

-        if (UserConfig.passcodeType == 1 && (AndroidUtilities.isTablet() || getContext().getResources().getConfiguration().orientation != Configuration.ORIENTATION_LANDSCAPE)) {
+        if (UserConfig.passcodeType == 1 && getContext().getResources().getConfiguration().orientation != Configuration.ORIENTATION_LANDSCAPE) {
            int t = 0;
            if (passwordFrameLayout.getTag() != null) {
                t = (Integer) passwordFrameLayout.getTag();
@@ -1,6 +1,6 @@
 /*******************************************************************************
 *
- *                          Messenger Android Frontend
+ *                              Delta Chat Android
 *                        (C) 2013-2016 Nikolai Kudashov
 *                           (C) 2017 Björn Petersen
 *                    Contact: r10s@b44t.com, http://b44t.com
@@ -21,7 +21,7 @@
 ******************************************************************************/


-package com.b44t.ui.Components;
+package com.b44t.messenger.Components;

 import android.content.Context;
 import android.graphics.Bitmap;
@@ -1,6 +1,6 @@
 /*******************************************************************************
 *
- *                          Messenger Android Frontend
+ *                              Delta Chat Android
 *                        (C) 2013-2016 Nikolai Kudashov
 *                           (C) 2017 Björn Petersen
 *                    Contact: r10s@b44t.com, http://b44t.com
@@ -21,7 +21,7 @@
 ******************************************************************************/


-package com.b44t.ui.Components;
+package com.b44t.messenger.Components;

 import android.content.Context;
 import android.graphics.Canvas;
@@ -1,6 +1,6 @@
 /*******************************************************************************
 *
- *                          Messenger Android Frontend
+ *                              Delta Chat Android
 *                        (C) 2013-2016 Nikolai Kudashov
 *                           (C) 2017 Björn Petersen
 *                    Contact: r10s@b44t.com, http://b44t.com
@@ -21,7 +21,7 @@
 ******************************************************************************/


-package com.b44t.ui.Components;
+package com.b44t.messenger.Components;

 import android.content.Context;
 import android.graphics.Canvas;
@@ -1,6 +1,6 @@
 /*******************************************************************************
 *
- *                          Messenger Android Frontend
+ *                              Delta Chat Android
 *                        (C) 2013-2016 Nikolai Kudashov
 *                           (C) 2017 Björn Petersen
 *                    Contact: r10s@b44t.com, http://b44t.com
@@ -21,7 +21,7 @@
 ******************************************************************************/


-package com.b44t.ui.Components;
+package com.b44t.messenger.Components;

 import android.annotation.SuppressLint;
 import android.content.Context;
@@ -1,6 +1,6 @@
 /*******************************************************************************
 *
- *                          Messenger Android Frontend
+ *                              Delta Chat Android
 *                        (C) 2013-2016 Nikolai Kudashov
 *                           (C) 2017 Björn Petersen
 *                    Contact: r10s@b44t.com, http://b44t.com
@@ -21,7 +21,7 @@
 ******************************************************************************/


-package com.b44t.ui.Components;
+package com.b44t.messenger.Components;

 import android.animation.Animator;
 import android.animation.AnimatorSet;
@@ -49,15 +49,14 @@ import android.widget.TextView;

 import com.b44t.messenger.AndroidUtilities;
 import com.b44t.messenger.ApplicationLoader;
-import com.b44t.messenger.LocaleController;
-import com.b44t.messenger.support.widget.LinearLayoutManager;
-import com.b44t.messenger.support.widget.RecyclerView;
+import com.b44t.messenger.aosp.LinearLayoutManager;
+import com.b44t.messenger.aosp.RecyclerView;
 import com.b44t.messenger.DispatchQueue;
 import com.b44t.messenger.R;
 import com.b44t.messenger.Utilities;
 import com.b44t.messenger.AnimatorListenerAdapterProxy;
-import com.b44t.ui.ActionBar.Theme;
-import com.b44t.ui.Cells.PhotoEditToolCell;
+import com.b44t.messenger.ActionBar.Theme;
+import com.b44t.messenger.Cells.PhotoEditToolCell;

 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
@@ -2292,7 +2291,7 @@ public class PhotoFilterView extends FrameLayout {
                }
            }
        });
-        editView.addView(valueSeekBar, LayoutHelper.createFrame(AndroidUtilities.isTablet() ? 498 : LayoutHelper.MATCH_PARENT, 60, AndroidUtilities.isTablet() ? Gravity.CENTER_HORIZONTAL | Gravity.TOP : Gravity.START | Gravity.TOP, 14, 10, 14, 0));
+        editView.addView(valueSeekBar, LayoutHelper.createFrame(LayoutHelper.MATCH_PARENT, 60, Gravity.START | Gravity.TOP, 14, 10, 14, 0));

        curveLayout = new FrameLayout(context);
        editView.addView(curveLayout, LayoutHelper.createFrame(LayoutHelper.MATCH_PARENT, 78, Gravity.CENTER_HORIZONTAL));
@@ -2699,19 +2698,6 @@ public class PhotoFilterView extends FrameLayout {
        layoutParams = (LayoutParams) curvesControl.getLayoutParams();
        layoutParams.height = viewHeight + AndroidUtilities.dp(28);
        curvesControl.setLayoutParams(layoutParams);
-
-        if (AndroidUtilities.isTablet()) {
-            int total = AndroidUtilities.dp(86) * 10;
-            layoutParams = (FrameLayout.LayoutParams) recyclerListView.getLayoutParams();
-            if (total < viewWidth) {
-                layoutParams.width = total;
-                layoutParams.leftMargin = (viewWidth - total) / 2;
-            } else {
-                layoutParams.width = LayoutHelper.MATCH_PARENT;
-                layoutParams.leftMargin = 0;
-            }
-            recyclerListView.setLayoutParams(layoutParams);
-        }
    }

    @Override
@@ -1,6 +1,6 @@
 /*******************************************************************************
 *
- *                          Messenger Android Frontend
+ *                              Delta Chat Android
 *                        (C) 2013-2016 Nikolai Kudashov
 *                           (C) 2017 Björn Petersen
 *                    Contact: r10s@b44t.com, http://b44t.com
@@ -21,7 +21,7 @@
 ******************************************************************************/


-package com.b44t.ui.Components;
+package com.b44t.messenger.Components;

 import android.content.Context;
 import android.graphics.Typeface;
@@ -33,9 +33,8 @@ import android.widget.LinearLayout;
 import android.widget.TextView;

 import com.b44t.messenger.AndroidUtilities;
-import com.b44t.messenger.LocaleController;
 import com.b44t.messenger.R;
-import com.b44t.ui.ActionBar.Theme;
+import com.b44t.messenger.ActionBar.Theme;

 public class PickerBottomLayout extends FrameLayout {

@@ -1,6 +1,6 @@
 /*******************************************************************************
 *
- *                          Messenger Android Frontend
+ *                              Delta Chat Android
 *                        (C) 2013-2016 Nikolai Kudashov
 *                           (C) 2017 Björn Petersen
 *                    Contact: r10s@b44t.com, http://b44t.com
@@ -21,7 +21,7 @@
 ******************************************************************************/


-package com.b44t.ui.Components;
+package com.b44t.messenger.Components;

 public class Point {
    public float x;
@@ -1,6 +1,6 @@
 /*******************************************************************************
 *
- *                          Messenger Android Frontend
+ *                              Delta Chat Android
 *                        (C) 2013-2016 Nikolai Kudashov
 *                           (C) 2017 Björn Petersen
 *                    Contact: r10s@b44t.com, http://b44t.com
@@ -21,7 +21,7 @@
 ******************************************************************************/


-package com.b44t.ui.Components;
+package com.b44t.messenger.Components;

 import android.animation.ObjectAnimator;
 import android.content.Context;
@@ -34,7 +34,7 @@ import android.graphics.PorterDuffXfermode;
 import android.view.View;

 import com.b44t.messenger.AndroidUtilities;
-import com.b44t.ui.ActionBar.Theme;
+import com.b44t.messenger.ActionBar.Theme;

 public class RadioButton extends View {

@@ -1,6 +1,6 @@
 /*******************************************************************************
 *
- *                          Messenger Android Frontend
+ *                              Delta Chat Android
 *                        (C) 2013-2016 Nikolai Kudashov
 *                           (C) 2017 Björn Petersen
 *                    Contact: r10s@b44t.com, http://b44t.com
@@ -21,7 +21,7 @@
 ******************************************************************************/


-package com.b44t.ui.Components;
+package com.b44t.messenger.Components;

 public class Rect {

@@ -1,6 +1,6 @@
 /*******************************************************************************
 *
- *                          Messenger Android Frontend
+ *                              Delta Chat Android
 *                        (C) 2013-2016 Nikolai Kudashov
 *                           (C) 2017 Björn Petersen
 *                    Contact: r10s@b44t.com, http://b44t.com
@@ -21,7 +21,7 @@
 ******************************************************************************/


-package com.b44t.ui.Components;
+package com.b44t.messenger.Components;

 import android.content.Context;
 import android.content.res.TypedArray;
@@ -34,7 +34,7 @@ import android.view.ViewConfiguration;
 import android.view.ViewGroup;

 import com.b44t.messenger.AndroidUtilities;
-import com.b44t.messenger.support.widget.RecyclerView;
+import com.b44t.messenger.aosp.RecyclerView;

 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
@@ -14,7 +14,7 @@
 * limitations under the License.
 */

-package com.b44t.ui.Components;
+package com.b44t.messenger.Components;

 import android.content.Context;
 import android.hardware.SensorManager;
@@ -1,6 +1,6 @@
 /*******************************************************************************
 *
- *                          Messenger Android Frontend
+ *                              Delta Chat Android
 *                        (C) 2013-2016 Nikolai Kudashov
 *                           (C) 2017 Björn Petersen
 *                    Contact: r10s@b44t.com, http://b44t.com
@@ -21,7 +21,7 @@
 ******************************************************************************/


-package com.b44t.ui.Components;
+package com.b44t.messenger.Components;

 import android.content.Context;
 import android.graphics.Canvas;
@@ -1,6 +1,6 @@
 /*******************************************************************************
 *
- *                          Messenger Android Frontend
+ *                              Delta Chat Android
 *                        (C) 2013-2016 Nikolai Kudashov
 *                           (C) 2017 Björn Petersen
 *                    Contact: r10s@b44t.com, http://b44t.com
@@ -21,7 +21,7 @@
 ******************************************************************************/


-package com.b44t.ui.Components;
+package com.b44t.messenger.Components;

 import android.content.Context;
 import android.graphics.Canvas;
@@ -1,6 +1,6 @@
 /*******************************************************************************
 *
- *                          Messenger Android Frontend
+ *                              Delta Chat Android
 *                        (C) 2013-2016 Nikolai Kudashov
 *                           (C) 2017 Björn Petersen
 *                    Contact: r10s@b44t.com, http://b44t.com
@@ -21,7 +21,7 @@
 ******************************************************************************/


-package com.b44t.ui.Components;
+package com.b44t.messenger.Components;

 public class Size {
    public float width;
@@ -1,6 +1,6 @@
 /*******************************************************************************
 *
- *                          Messenger Android Frontend
+ *                              Delta Chat Android
 *                        (C) 2013-2016 Nikolai Kudashov
 *                           (C) 2017 Björn Petersen
 *                    Contact: r10s@b44t.com, http://b44t.com
@@ -21,7 +21,7 @@
 ******************************************************************************/


-package com.b44t.ui.Components;
+package com.b44t.messenger.Components;

 import android.content.Context;
 import android.graphics.Canvas;
--- a/Show More
+++ b/Show More