Version 1.7.2: Mix peer to grouped_id.

Version 1.7.2: Update version in code.
Version 1.7.2.
2019-06-01 00:51:57 +03:00 · 2019-05-31 21:17:08 +03:00 · 2019-05-31 21:15:55 +03:00 · 2019-05-31 21:10:53 +03:00 · 2019-05-31 19:47:48 +03:00 · 2019-05-31 19:47:31 +03:00
1504 changed files with 151025 additions and 63017 deletions
--- a/.appveyor/install.bat
+++ b/.appveyor/install.bat
@@ -27,7 +27,12 @@ GOTO:EOF
    call:logInfo "Clone dependencies repository"
    git clone -q --depth 1 --branch=master https://github.com/telegramdesktop/dependencies_windows.git %LIB_DIR%
    cd %LIB_DIR%
-    git clone https://github.com/Microsoft/Range-V3-VS2015 range-v3
+
+    git clone https://github.com/ericniebler/range-v3
+    cd range-v3
+    git checkout 0.5.0
+    cd ..
+
    if exist prepare.bat (
        call prepare.bat
    ) else (
@@ -48,7 +53,7 @@ GOTO:EOF
    git submodule init
    git submodule update
    cd %SRC_DIR%\Telegram
-    call gyp\refresh.bat
+    call gyp\refresh.bat --api-id 17349 --api-hash 344583e45741c457fe1862106095a5eb
 GOTO:EOF

 :configureBuild
@@ -56,10 +61,6 @@ GOTO:EOF
    call:logInfo "Build version: %BUILD_VERSION%"
    set TDESKTOP_BUILD_DEFINES=

-    echo %BUILD_VERSION% | findstr /C:"disable_autoupdate">nul && (
-        set TDESKTOP_BUILD_DEFINES=%TDESKTOP_BUILD_DEFINES%,TDESKTOP_DISABLE_AUTOUPDATE
-    )
-
    echo %BUILD_VERSION% | findstr /C:"disable_register_custom_scheme">nul && (
        set TDESKTOP_BUILD_DEFINES=%TDESKTOP_BUILD_DEFINES%,TDESKTOP_DISABLE_REGISTER_CUSTOM_SCHEME
    )
@@ -76,10 +77,6 @@ GOTO:EOF
        set TDESKTOP_BUILD_DEFINES=%TDESKTOP_BUILD_DEFINES%,TDESKTOP_DISABLE_DESKTOP_FILE_GENERATION
    )

-    echo %BUILD_VERSION% | findstr /C:"disable_unity_integration">nul && (
-        set TDESKTOP_BUILD_DEFINES=%TDESKTOP_BUILD_DEFINES%,TDESKTOP_DISABLE_UNITY_INTEGRATION
-    )
-
    echo %BUILD_VERSION% | findstr /C:"disable_gtk_integration">nul && (
        set TDESKTOP_BUILD_DEFINES=%TDESKTOP_BUILD_DEFINES%,TDESKTOP_DISABLE_GTK_INTEGRATION
    )
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -24,6 +24,8 @@ If we find issues with your pull request, we may suggest some changes and improv

 Unfortunately we **do not merge** any pull requests that have new feature implementations, translations to new languages and those which introduce any new user interface elements.

+If you have a translations-related contribution, check out [Translations platform][translate].
+
 Telegram Desktop is not a standalone application but a part of [Telegram project][telegram], so all the decisions about the features, languages, user experience, user interface and the design are made inside Telegram team, often according to some roadmap which is not public.

 ## Build instructions
@@ -33,7 +35,7 @@ environments.

 ## Pull upstream changes into your fork regularly

-Telegram Desktop is advancing quickly. It is therefore critical that you pull upstream changes into your fork on a regular basis. Nothing is worse than putting in a days of hard work into a pull request only to have it rejected because it has diverged too far from upstram.
+Telegram Desktop is advancing quickly. It is therefore critical that you pull upstream changes into your fork on a regular basis. Nothing is worse than putting in a days of hard work into a pull request only to have it rejected because it has diverged too far from upstream.

 To pull in upstream changes:

@@ -113,3 +115,4 @@ Before you submit a pull request, please test your changes. Verify that Telegram
 [pr]: https://github.com/telegramdesktop/tdesktop/compare
 [build_instructions]: https://github.com/telegramdesktop/tdesktop/blob/master/README.md#build-instructions
 [closing-issues-via-commit-messages]: https://help.github.com/articles/closing-issues-via-commit-messages/
+[translate]: https://translations.telegram.org
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -22,8 +22,5 @@ Tell us what happens instead
 **Used theme**:

 <details><summary><b>Logs</b>:</summary>
-Insert logs here (if necessary)
-
-<!-- You can type `debugmode` in settings and then see ~/.TelegramDesktop/DebugLogs/log_...txt for log files.
-Type `debugmode` in settings again to disable logs. -->
+Insert log.txt here (if necessary)
 </details>
--- a/.gitignore
+++ b/.gitignore
@@ -50,6 +50,15 @@ ipch/
 project.xcworkspace
 xcuserdata

+parts
+prime
+stage
+*.snap
+.snapcraft
+/snap/gui/*.png
+/snap/gui/*.desktop
+/snap/plugins/__pycache__
+
 /Telegram/*.user.*
 *.pro.user
 /Linux/
--- a/.gitmodules
+++ b/.gitmodules
@@ -13,3 +13,12 @@
 [submodule "Telegram/ThirdParty/crl"]
 	path = Telegram/ThirdParty/crl
 	url = https://github.com/telegramdesktop/crl.git
+[submodule "Telegram/ThirdParty/xxHash"]
+	path = Telegram/ThirdParty/xxHash
+	url = https://github.com/Cyan4973/xxHash.git
+[submodule "Telegram/ThirdParty/qtlottie"]
+	path = Telegram/ThirdParty/qtlottie
+	url = https://github.com/telegramdesktop/qtlottie.git
+[submodule "Telegram/ThirdParty/rapidjson"]
+	path = Telegram/ThirdParty/rapidjson
+	url = https://github.com/Tencent/rapidjson.git
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,12 +10,10 @@ cache:
 env:
  matrix:
   - BUILD_VERSION=""
-   - BUILD_VERSION="disable_autoupdate"
   - BUILD_VERSION="disable_register_custom_scheme"
   - BUILD_VERSION="disable_crash_reports"
   - BUILD_VERSION="disable_network_proxy"
   - BUILD_VERSION="disable_desktop_file_generation"
-   - BUILD_VERSION="disable_unity_integration"
   - BUILD_VERSION="disable_gtk_integration"

 matrix:
@@ -33,8 +31,8 @@ addons:
      - dpatch
      - equivs
      - fakeroot
-      - g++-7
-      - gcc-7
+      - g++-8
+      - gcc-8
      - git
      - gnome-common
      - gobject-introspection
@@ -46,7 +44,7 @@ addons:
      - libopus-dev
      - libpulse-dev
      - libssl-dev
-      - libunity-dev
+      - libdee-dev
      - libva-dev
      - libvdpau-dev
      - libxcb-xkb-dev
@@ -58,8 +56,8 @@ addons:
      - yasm

 before_install:
-  - export CXX="g++-7" CC="gcc-7"
-  - sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-7 60 --slave /usr/bin/g++ g++ /usr/bin/g++-7
+  - export CXX="g++-8" CC="gcc-8"
+  - sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-8 60 --slave /usr/bin/g++ g++ /usr/bin/g++-8
  - sudo update-alternatives --config gcc
  - g++ --version

--- a/.travis/build.sh
+++ b/.travis/build.sh
@@ -17,7 +17,7 @@ XKB_PATH="$BUILD/libxkbcommon"
 XKB_CACHE_VERSION="3"

 QT_PATH="$BUILD/qt"
-QT_CACHE_VERSION="3"
+QT_CACHE_VERSION="4"
 QT_PATCH="$UPSTREAM/Telegram/Patches/qtbase_${QT_VERSION//\./_}.diff"

 BREAKPAD_PATH="$BUILD/breakpad"
@@ -40,7 +40,7 @@ FFMPEG_PATH="$BUILD/ffmpeg"
 FFMPEG_CACHE_VERSION="3"

 OPENAL_PATH="$BUILD/openal-soft"
-OPENAL_CACHE_VERSION="3"
+OPENAL_CACHE_VERSION="4"

 GYP_DEFINES=""

@@ -100,10 +100,6 @@ build() {
  fi

  # Configure the build
-  if [[ $BUILD_VERSION == *"disable_autoupdate"* ]]; then
-    GYP_DEFINES+=",TDESKTOP_DISABLE_AUTOUPDATE"
-  fi
-
  if [[ $BUILD_VERSION == *"disable_register_custom_scheme"* ]]; then
    GYP_DEFINES+=",TDESKTOP_DISABLE_REGISTER_CUSTOM_SCHEME"
  fi
@@ -120,10 +116,6 @@ build() {
    GYP_DEFINES+=",TDESKTOP_DISABLE_DESKTOP_FILE_GENERATION"
  fi

-  if [[ $BUILD_VERSION == *"disable_unity_integration"* ]]; then
-    GYP_DEFINES+=",TDESKTOP_DISABLE_UNITY_INTEGRATION"
-  fi
-
  if [[ $BUILD_VERSION == *"disable_gtk_integration"* ]]; then
    GYP_DEFINES+=",TDESKTOP_DISABLE_GTK_INTEGRATION"
  fi
@@ -322,6 +314,7 @@ buildVdpau() {
  git clone git://anongit.freedesktop.org/vdpau/libvdpau

  cd "$EXTERNAL/libvdpau"
+  git checkout libvdpau-1.2
  ./autogen.sh --prefix=$VDPAU_PATH --enable-static
  make $MAKE_ARGS
  sudo make install
@@ -476,10 +469,12 @@ buildOpenAL() {
    rm -rf "$EXTERNAL/openal-soft"
  fi
  cd $OPENAL_PATH
-  rm -rf *
+  sudo rm -rf *

  cd "$EXTERNAL"
  git clone https://github.com/kcat/openal-soft.git
+  cd openal-soft
+  git checkout openal-soft-1.19.1

  cd "$EXTERNAL/openal-soft/build"
  cmake \
@@ -606,6 +601,7 @@ buildCustomQt() {
  cd "$EXTERNAL/qt${QT_VERSION}/qtbase/src/plugins/platforminputcontexts"
  git clone https://github.com/telegramdesktop/fcitx.git
  git clone https://github.com/telegramdesktop/hime.git
+  git clone https://github.com/telegramdesktop/nimf.git
  cd ../../../..

  ./configure -prefix $QT_PATH -release -opensource -confirm-license -qt-zlib \
@@ -677,6 +673,8 @@ buildTelegram() {

  cd "$UPSTREAM/Telegram/gyp"
  "$GYP_PATH/gyp" \
+      -Dapi_id=17349 \
+      -Dapi_hash=344583e45741c457fe1862106095a5eb \
      -Dbuild_defines=${GYP_DEFINES:1} \
      -Dlinux_path_xkbcommon=$XKB_PATH \
      -Dlinux_path_va=$VA_PATH \
--- a/2
+++ b/2
@@ -1,7 +1,7 @@
 This file is part of Telegram Desktop,
 the official desktop application for the Telegram messaging service.

-Copyright (c) 2014-2018 John Preston, https://desktop.telegram.org
+Copyright (c) 2014-2019 John Preston, https://desktop.telegram.org

 Telegram Desktop is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
--- a/README.md
+++ b/README.md
@@ -15,8 +15,10 @@ The source code is published under GPLv3 with OpenSSL exception, the license is
 * Windows XP - Windows 10 (**not** RT)
 * Mac OS X 10.8 - Mac OS X 10.11
 * Mac OS X 10.6 - Mac OS X 10.7 (separate build)
-* Ubuntu 12.04 - Ubuntu 18.04
-* Fedora 22 - Fedora 24
+* Ubuntu 12.04 - Ubuntu 19.04
+* Fedora 22 - Fedora 30
+* [Snappy](https://snapcraft.io/telegram-desktop)
+* [Flathub](https://flathub.org/apps/details/org.telegram.desktop)

 ## Third-party

@@ -30,7 +32,7 @@ The source code is published under GPLv3 with OpenSSL exception, the license is
 * Google Crashpad ([Apache License 2.0](https://chromium.googlesource.com/crashpad/crashpad/+/master/LICENSE))
 * GYP ([BSD License](https://github.com/bnoordhuis/gyp/blob/master/LICENSE))
 * Ninja ([Apache License 2.0](https://github.com/ninja-build/ninja/blob/master/COPYING))
-* OpenAL Soft ([LGPL](http://kcat.strangesoft.net/openal.html))
+* OpenAL Soft ([LGPL](https://github.com/kcat/openal-soft/blob/master/COPYING))
 * Opus codec ([BSD License](http://www.opus-codec.org/license/))
 * FFmpeg ([LGPL](https://www.ffmpeg.org/legal.html))
 * Guideline Support Library ([MIT License](https://github.com/Microsoft/GSL/blob/master/LICENSE))
@@ -39,11 +41,12 @@ The source code is published under GPLv3 with OpenSSL exception, the license is
 * Open Sans font ([Apache License 2.0](http://www.apache.org/licenses/LICENSE-2.0.html))
 * Emoji alpha codes ([MIT License](https://github.com/emojione/emojione/blob/master/extras/alpha-codes/LICENSE.md))
 * Catch test framework ([Boost License](https://github.com/philsquared/Catch/blob/master/LICENSE.txt))
+* xxHash ([BSD License](https://github.com/Cyan4973/xxHash/blob/dev/LICENSE))

 ## Build instructions

-* [Visual Studio 2017][msvc]
-* [Xcode 9][xcode]
+* [Visual Studio 2019][msvc]
+* [Xcode 10][xcode]
 * [GYP/CMake on GNU/Linux][cmake]

 [//]: # (LINKS)
--- a/Telegram/Patches/breakpad.diff
+++ b/Telegram/Patches/breakpad.diff
@@ -1,5 +1,5 @@
 diff --git a/src/build/common.gypi b/src/build/common.gypi
-index 29990c6..53e99d4 100644
+index 29990c65..53e99d44 100644
 --- a/src/build/common.gypi
 +++ b/src/build/common.gypi
@@ -330,6 +330,7 @@
@@ -11,7 +11,7 @@ index 29990c6..53e99d4 100644
         },
       }],
 diff --git a/src/client/mac/Breakpad.xcodeproj/project.pbxproj b/src/client/mac/Breakpad.xcodeproj/project.pbxproj
-index 1a93ce6..1c1d643 100644
+index 1a93ce6d..b5986e33 100644
 --- a/src/client/mac/Breakpad.xcodeproj/project.pbxproj
 +++ b/src/client/mac/Breakpad.xcodeproj/project.pbxproj
@@ -35,6 +35,19 @@
@@ -34,7 +34,15 @@ index 1a93ce6..1c1d643 100644
 		162F64F2161C577500CD68D5 /* arch_utilities.cc in Sources */ = {isa = PBXBuildFile; fileRef = 162F64F0161C577500CD68D5 /* arch_utilities.cc */; };
 		162F64F3161C577500CD68D5 /* arch_utilities.h in Headers */ = {isa = PBXBuildFile; fileRef = 162F64F1161C577500CD68D5 /* arch_utilities.h */; };
 		162F64F4161C579B00CD68D5 /* arch_utilities.cc in Sources */ = {isa = PBXBuildFile; fileRef = 162F64F0161C577500CD68D5 /* arch_utilities.cc */; };
-@@ -170,11 +183,8 @@
+@@ -67,6 +80,7 @@
+ 		4DBE49A7134A4F280072546A /* CoreServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4DBE4769134A4F080072546A /* CoreServices.framework */; };
+ 		4DBE49A8134A4F380072546A /* CoreServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4DBE4769134A4F080072546A /* CoreServices.framework */; };
+ 		4DBE49A9134A4F460072546A /* CoreServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4DBE4769134A4F080072546A /* CoreServices.framework */; };
+		5A8B220921E0C5740045F83C /* breakpad_nlist_64.cc in Sources */ = {isa = PBXBuildFile; fileRef = F92C53690ECCE3FD009BE4BA /* breakpad_nlist_64.cc */; };
+ 		8B3101C611F0CD9F00FCF3E4 /* AppKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0867D6A5FE840307C02AAC07 /* AppKit.framework */; };
+ 		8B3101C711F0CD9F00FCF3E4 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0867D69BFE84028FC02AAC07 /* Foundation.framework */; };
+ 		8B3101CA11F0CDB000FCF3E4 /* AppKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0867D6A5FE840307C02AAC07 /* AppKit.framework */; };
+@@ -170,11 +184,8 @@
 		F92C564A0ECD10CA009BE4BA /* string_conversion.cc in Sources */ = {isa = PBXBuildFile; fileRef = F92C53850ECCE6AD009BE4BA /* string_conversion.cc */; };
 		F92C564C0ECD10DD009BE4BA /* breakpadUtilities.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F92C563C0ECD10B3009BE4BA /* breakpadUtilities.dylib */; };
 		F92C56570ECD113E009BE4BA /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F92C554A0ECCF530009BE4BA /* Carbon.framework */; };
@@ -46,7 +54,7 @@ index 1a93ce6..1c1d643 100644
 		F92C56A90ECE04C5009BE4BA /* crash_report_sender.m in Sources */ = {isa = PBXBuildFile; fileRef = F92C56A80ECE04C5009BE4BA /* crash_report_sender.m */; };
 		F93803CD0F8083B7004D428B /* dynamic_images.cc in Sources */ = {isa = PBXBuildFile; fileRef = F92C536B0ECCE3FD009BE4BA /* dynamic_images.cc */; };
 		F93803CE0F8083B7004D428B /* exception_handler.cc in Sources */ = {isa = PBXBuildFile; fileRef = F92C536D0ECCE3FD009BE4BA /* exception_handler.cc */; };
-@@ -213,7 +223,6 @@
+@@ -213,7 +224,6 @@
 		F9C44DBD0EF072A0003AEBAA /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = F9C44DBA0EF072A0003AEBAA /* MainMenu.xib */; };
 		F9C44E000EF077CD003AEBAA /* Breakpad.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8DC2EF5B0486A6940098B216 /* Breakpad.framework */; };
 		F9C44E3C0EF08B12003AEBAA /* Breakpad.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 8DC2EF5B0486A6940098B216 /* Breakpad.framework */; };
@@ -54,7 +62,7 @@ index 1a93ce6..1c1d643 100644
 		F9C44EA20EF09F93003AEBAA /* HTTPMultipartUpload.m in Sources */ = {isa = PBXBuildFile; fileRef = F92C53770ECCE635009BE4BA /* HTTPMultipartUpload.m */; };
 		F9C44EE50EF0A006003AEBAA /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F9C44EE40EF0A006003AEBAA /* SystemConfiguration.framework */; };
 		F9C44EE90EF0A3C1003AEBAA /* GTMLogger.m in Sources */ = {isa = PBXBuildFile; fileRef = F9C44EE80EF0A3C1003AEBAA /* GTMLogger.m */; };
-@@ -410,20 +419,6 @@
+@@ -410,20 +420,6 @@
 			remoteGlobalIDString = F92C563B0ECD10B3009BE4BA;
 			remoteInfo = breakpadUtilities;
 		};
@@ -75,7 +83,7 @@ index 1a93ce6..1c1d643 100644
 		F93DE2FB0F82C3C600608B94 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
-@@ -536,13 +531,6 @@
+@@ -536,13 +532,6 @@
 			remoteGlobalIDString = 8DC2EF4F0486A6940098B216;
 			remoteInfo = Breakpad;
 		};
@@ -89,7 +97,7 @@ index 1a93ce6..1c1d643 100644
 /* End PBXContainerItemProxy section */
 
 /* Begin PBXCopyFilesBuildPhase section */
-@@ -714,7 +702,6 @@
+@@ -714,7 +703,6 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
@@ -97,7 +105,7 @@ index 1a93ce6..1c1d643 100644
 				8DC2EF570486A6940098B216 /* Cocoa.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
-@@ -1181,18 +1168,13 @@
+@@ -1181,18 +1169,13 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 1DEB91AD08733DA50010E9CD /* Build configuration list for PBXNativeTarget "Breakpad" */;
 			buildPhases = (
@@ -116,7 +124,7 @@ index 1a93ce6..1c1d643 100644
 			);
 			name = Breakpad;
 			productInstallPath = "$(HOME)/Library/Frameworks";
-@@ -1399,6 +1381,8 @@
+@@ -1399,6 +1382,8 @@
 /* Begin PBXProject section */
 		0867D690FE84028FC02AAC07 /* Project object */ = {
 			isa = PBXProject;
@@ -125,7 +133,7 @@ index 1a93ce6..1c1d643 100644
 			buildConfigurationList = 1DEB91B108733DA50010E9CD /* Build configuration list for PBXProject "Breakpad" */;
 			compatibilityVersion = "Xcode 3.1";
 			developmentRegion = English;
-@@ -1583,16 +1567,6 @@
+@@ -1583,16 +1568,6 @@
 /* End PBXReferenceProxy section */
 
 /* Begin PBXResourcesBuildPhase section */
@@ -142,7 +150,7 @@ index 1a93ce6..1c1d643 100644
 		F92C569C0ECE04A7009BE4BA /* Resources */ = {
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
-@@ -1640,20 +1614,6 @@
+@@ -1640,20 +1615,6 @@
 			shellPath = /bin/sh;
 			shellScript = "install_name_tool -id \"@executable_path/../Resources/breakpadUtilities.dylib\" \"${BUILT_PRODUCTS_DIR}/breakpadUtilities.dylib\"\n";
 		};
@@ -163,10 +171,11 @@ index 1a93ce6..1c1d643 100644
 		F9C77DD80F7DD5CF0045F7DB /* ShellScript */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
-@@ -1674,6 +1634,19 @@
+@@ -1674,6 +1635,20 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				5A8B220921E0C5740045F83C /* breakpad_nlist_64.cc in Sources */,
 +				0748C0501C63C52D004489BF /* bootstrap_compat.cc in Sources */,
 +				0748C04F1C63C523004489BF /* macho_walker.cc in Sources */,
 +				0748C04E1C63C51C004489BF /* md5.cc in Sources */,
@@ -183,7 +192,7 @@ index 1a93ce6..1c1d643 100644
 				F92C565F0ECD116B009BE4BA /* protected_memory_allocator.cc in Sources */,
 				F92C56630ECD1179009BE4BA /* exception_handler.cc in Sources */,
 				F92C55D10ECD0064009BE4BA /* Breakpad.mm in Sources */,
-@@ -1955,16 +1928,6 @@
+@@ -1955,16 +1930,6 @@
 			target = F92C563B0ECD10B3009BE4BA /* breakpadUtilities */;
 			targetProxy = F92C564D0ECD10E5009BE4BA /* PBXContainerItemProxy */;
 		};
@@ -200,7 +209,7 @@ index 1a93ce6..1c1d643 100644
 		F93DE2FC0F82C3C600608B94 /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
 			target = F93803BD0F80820F004D428B /* generator_test */;
-@@ -2025,11 +1988,6 @@
+@@ -2025,11 +1990,6 @@
 			target = 8DC2EF4F0486A6940098B216 /* Breakpad */;
 			targetProxy = F9C44E190EF0790F003AEBAA /* PBXContainerItemProxy */;
 		};
@@ -212,7 +221,7 @@ index 1a93ce6..1c1d643 100644
 /* End PBXTargetDependency section */
 
 /* Begin PBXVariantGroup section */
-@@ -2126,8 +2084,12 @@
+@@ -2126,8 +2086,12 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = 8B31027711F0D3AF00FCF3E4 /* BreakpadDebug.xcconfig */;
 			buildSettings = {
@@ -226,7 +235,7 @@ index 1a93ce6..1c1d643 100644
 			};
 			name = Debug;
 		};
-@@ -2135,7 +2097,12 @@
+@@ -2135,7 +2099,12 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = 8B31027811F0D3AF00FCF3E4 /* BreakpadRelease.xcconfig */;
 			buildSettings = {
@@ -239,7 +248,7 @@ index 1a93ce6..1c1d643 100644
 			};
 			name = Release;
 		};
-@@ -2454,7 +2421,12 @@
+@@ -2454,7 +2423,12 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = 8B31027711F0D3AF00FCF3E4 /* BreakpadDebug.xcconfig */;
 			buildSettings = {
@@ -253,7 +262,7 @@ index 1a93ce6..1c1d643 100644
 			name = "Debug With Code Coverage";
 		};
 diff --git a/src/client/mac/Framework/Breakpad.mm b/src/client/mac/Framework/Breakpad.mm
-index 1d2e519..943310f 100644
+index 1d2e519b..943310fa 100644
 --- a/src/client/mac/Framework/Breakpad.mm
 +++ b/src/client/mac/Framework/Breakpad.mm
@@ -355,10 +355,10 @@ bool Breakpad::Initialize(NSDictionary *parameters) {
@@ -480,7 +489,7 @@ index 1d2e519..943310f 100644
 }
 
 diff --git a/src/common/language.cc b/src/common/language.cc
-index 978fb85..a95ae5f 100644
+index 978fb855..a95ae5f7 100644
 --- a/src/common/language.cc
 +++ b/src/common/language.cc
@@ -46,8 +46,27 @@
@@ -552,7 +561,7 @@ index 978fb85..a95ae5f 100644
 #endif
   }
 diff --git a/src/common/linux/elf_symbols_to_module.cc b/src/common/linux/elf_symbols_to_module.cc
-index 562875e..4367851 100644
+index 562875e1..43678510 100644
 --- a/src/common/linux/elf_symbols_to_module.cc
 +++ b/src/common/linux/elf_symbols_to_module.cc
@@ -39,6 +39,29 @@
@@ -615,7 +624,7 @@ index 562875e..4367851 100644
       module->AddExtern(ext);
     }
 diff --git a/src/tools/linux/tools_linux.gypi b/src/tools/linux/tools_linux.gypi
-index 1c15992..020e4c1 100644
+index 1c15992e..020e4c1c 100644
 --- a/src/tools/linux/tools_linux.gypi
 +++ b/src/tools/linux/tools_linux.gypi
@@ -58,7 +58,7 @@
@@ -627,3 +636,16 @@ index 1c15992..020e4c1 100644
       ],
       'dependencies': [
         '../common/common.gyp:common',
+diff --git a/src/tools/mac/dump_syms/macho_dump.cc b/src/tools/mac/dump_syms/macho_dump.cc
+index d882bbe8..3432bb45 100644
+--- a/src/tools/mac/dump_syms/macho_dump.cc
+++ b/src/tools/mac/dump_syms/macho_dump.cc
+@@ -140,7 +140,7 @@ void DumpFile(const char *filename) {
+   size_t object_files_size;
+   const SuperFatArch* super_fat_object_files =
+       fat_reader.object_files(&object_files_size);
+-  struct fat_arch *object_files;
+  struct fat_arch *object_files = 0;
+   if (!super_fat_object_files->ConvertToFatArch(object_files)) {
+     exit(1);
+   }
--- a/Telegram/Patches/build_ffmpeg_win.sh
+++ b/Telegram/Patches/build_ffmpeg_win.sh
@@ -12,7 +12,108 @@ pacman --noconfirm -S pkg-config

 PKG_CONFIG_PATH="/mingw64/lib/pkgconfig:$PKG_CONFIG_PATH"

-./configure --toolchain=msvc --disable-programs --disable-doc --disable-everything --enable-protocol=file --enable-libopus --enable-decoder=aac --enable-decoder=aac_latm --enable-decoder=aasc --enable-decoder=flac --enable-decoder=gif --enable-decoder=h264 --enable-decoder=mp1 --enable-decoder=mp1float --enable-decoder=mp2 --enable-decoder=mp2float --enable-decoder=mp3 --enable-decoder=mp3adu --enable-decoder=mp3adufloat --enable-decoder=mp3float --enable-decoder=mp3on4 --enable-decoder=mp3on4float --enable-decoder=mpeg4 --enable-decoder=msmpeg4v2 --enable-decoder=msmpeg4v3 --enable-decoder=wavpack --enable-decoder=opus --enable-decoder=pcm_alaw --enable-decoder=pcm_alaw_at --enable-decoder=pcm_f32be --enable-decoder=pcm_f32le --enable-decoder=pcm_f64be --enable-decoder=pcm_f64le --enable-decoder=pcm_lxf --enable-decoder=pcm_mulaw --enable-decoder=pcm_mulaw_at --enable-decoder=pcm_s16be --enable-decoder=pcm_s16be_planar --enable-decoder=pcm_s16le --enable-decoder=pcm_s16le_planar --enable-decoder=pcm_s24be --enable-decoder=pcm_s24daud --enable-decoder=pcm_s24le --enable-decoder=pcm_s24le_planar --enable-decoder=pcm_s32be --enable-decoder=pcm_s32le --enable-decoder=pcm_s32le_planar --enable-decoder=pcm_s64be --enable-decoder=pcm_s64le --enable-decoder=pcm_s8 --enable-decoder=pcm_s8_planar --enable-decoder=pcm_u16be --enable-decoder=pcm_u16le --enable-decoder=pcm_u24be --enable-decoder=pcm_u24le --enable-decoder=pcm_u32be --enable-decoder=pcm_u32le --enable-decoder=pcm_u8 --enable-decoder=pcm_zork --enable-decoder=vorbis --enable-decoder=wmalossless --enable-decoder=wmapro --enable-decoder=wmav1 --enable-decoder=wmav2 --enable-decoder=wmavoice --enable-encoder=libopus --enable-hwaccel=h264_d3d11va --enable-hwaccel=h264_dxva2 --enable-parser=aac --enable-parser=aac_latm --enable-parser=flac --enable-parser=h264 --enable-parser=mpeg4video --enable-parser=mpegaudio --enable-parser=opus --enable-parser=vorbis --enable-demuxer=aac --enable-demuxer=flac --enable-demuxer=gif --enable-demuxer=h264 --enable-demuxer=mov --enable-demuxer=mp3 --enable-demuxer=ogg --enable-demuxer=wav --enable-muxer=ogg --enable-muxer=opus --extra-ldflags="-libpath:$FullExecPath/../opus/win32/VS2015/Win32/Release"
+./configure --toolchain=msvc \
+--extra-ldflags="-libpath:$FullExecPath/../opus/win32/VS2015/Win32/Release" \
+--disable-programs \
+--disable-doc \
+--disable-network \
+--disable-everything \
+--enable-hwaccel=h264_d3d11va \
+--enable-hwaccel=h264_d3d11va2 \
+--enable-hwaccel=h264_dxva2 \
+--enable-hwaccel=hevc_d3d11va \
+--enable-hwaccel=hevc_d3d11va2 \
+--enable-hwaccel=hevc_dxva2 \
+--enable-hwaccel=mpeg2_d3d11va \
+--enable-hwaccel=mpeg2_d3d11va2 \
+--enable-hwaccel=mpeg2_dxva2 \
+--enable-protocol=file --enable-libopus \
+--enable-decoder=aac \
+--enable-decoder=aac_at \
+--enable-decoder=aac_fixed \
+--enable-decoder=aac_latm \
+--enable-decoder=aasc \
+--enable-decoder=alac \
+--enable-decoder=alac_at \
+--enable-decoder=flac \
+--enable-decoder=gif \
+--enable-decoder=h264 \
+--enable-decoder=hevc \
+--enable-decoder=mp1 \
+--enable-decoder=mp1float \
+--enable-decoder=mp2 \
+--enable-decoder=mp2float \
+--enable-decoder=mp3 \
+--enable-decoder=mp3adu \
+--enable-decoder=mp3adufloat \
+--enable-decoder=mp3float \
+--enable-decoder=mp3on4 \
+--enable-decoder=mp3on4float \
+--enable-decoder=mpeg4 \
+--enable-decoder=msmpeg4v2 \
+--enable-decoder=msmpeg4v3 \
+--enable-decoder=opus \
+--enable-decoder=pcm_alaw \
+--enable-decoder=pcm_alaw_at \
+--enable-decoder=pcm_f32be \
+--enable-decoder=pcm_f32le \
+--enable-decoder=pcm_f64be \
+--enable-decoder=pcm_f64le \
+--enable-decoder=pcm_lxf \
+--enable-decoder=pcm_mulaw \
+--enable-decoder=pcm_mulaw_at \
+--enable-decoder=pcm_s16be \
+--enable-decoder=pcm_s16be_planar \
+--enable-decoder=pcm_s16le \
+--enable-decoder=pcm_s16le_planar \
+--enable-decoder=pcm_s24be \
+--enable-decoder=pcm_s24daud \
+--enable-decoder=pcm_s24le \
+--enable-decoder=pcm_s24le_planar \
+--enable-decoder=pcm_s32be \
+--enable-decoder=pcm_s32le \
+--enable-decoder=pcm_s32le_planar \
+--enable-decoder=pcm_s64be \
+--enable-decoder=pcm_s64le \
+--enable-decoder=pcm_s8 \
+--enable-decoder=pcm_s8_planar \
+--enable-decoder=pcm_u16be \
+--enable-decoder=pcm_u16le \
+--enable-decoder=pcm_u24be \
+--enable-decoder=pcm_u24le \
+--enable-decoder=pcm_u32be \
+--enable-decoder=pcm_u32le \
+--enable-decoder=pcm_u8 \
+--enable-decoder=pcm_zork \
+--enable-decoder=vorbis \
+--enable-decoder=wavpack \
+--enable-decoder=wmalossless \
+--enable-decoder=wmapro \
+--enable-decoder=wmav1 \
+--enable-decoder=wmav2 \
+--enable-decoder=wmavoice \
+--enable-encoder=libopus \
+--enable-parser=aac \
+--enable-parser=aac_latm \
+--enable-parser=flac \
+--enable-parser=h264 \
+--enable-parser=hevc \
+--enable-parser=mpeg4video \
+--enable-parser=mpegaudio \
+--enable-parser=opus \
+--enable-parser=vorbis \
+--enable-demuxer=aac \
+--enable-demuxer=flac \
+--enable-demuxer=gif \
+--enable-demuxer=h264 \
+--enable-demuxer=hevc \
+--enable-demuxer=m4v \
+--enable-demuxer=mov \
+--enable-demuxer=mp3 \
+--enable-demuxer=ogg \
+--enable-demuxer=wav \
+--enable-muxer=ogg \
+--enable-muxer=opus

 make -j4
 make -j4 install
--- a/Telegram/Patches/gyp.diff
+++ b/Telegram/Patches/gyp.diff
@@ -1,8 +1,8 @@
 diff --git a/pylib/gyp/generator/cmake.py b/pylib/gyp/generator/cmake.py
-index a2b9629..68d7020 100644
+index 4a2041cf..e5333926 100644
 --- a/pylib/gyp/generator/cmake.py
 +++ b/pylib/gyp/generator/cmake.py
-@@ -1070,6 +1070,23 @@ def WriteTarget(namer, qualified_target, target_dicts, build_dir, config_to_use,
+@@ -1078,6 +1078,23 @@ def WriteTarget(namer, qualified_target, target_dicts, build_dir, config_to_use,
 
       output.write(')\n')
 
@@ -26,49 +26,101 @@ index a2b9629..68d7020 100644
   UnsetVariable(output, 'TOOLSET')
   UnsetVariable(output, 'TARGET')
 
+@@ -1120,6 +1137,8 @@ def GenerateOutputForConfig(target_list, target_dicts, data,
+   SetVariable(output, 'configuration', config_to_use)
+ 
+   ar = None
+  ranlib = None
+  nm = None
+   cc = None
+   cxx = None
+ 
+@@ -1129,17 +1148,27 @@ def GenerateOutputForConfig(target_list, target_dicts, data,
+   for key, value in make_global_settings:
+     if key == 'AR':
+       ar = os.path.join(build_to_top, value)
+    if key == 'RANLIB':
+      ranlib = os.path.join(build_to_top, value)
+    if key == 'NM':
+      nm = os.path.join(build_to_top, value)
+     if key == 'CC':
+       cc = os.path.join(build_to_top, value)
+     if key == 'CXX':
+       cxx = os.path.join(build_to_top, value)
+ 
+   ar = gyp.common.GetEnvironFallback(['AR_target', 'AR'], ar)
+  ranlib = gyp.common.GetEnvironFallback(['RANLIB_target', 'RANLIB'], ranlib)
+  nm = gyp.common.GetEnvironFallback(['NM_target', 'NM'], nm)
+   cc = gyp.common.GetEnvironFallback(['CC_target', 'CC'], cc)
+   cxx = gyp.common.GetEnvironFallback(['CXX_target', 'CXX'], cxx)
+ 
+   if ar:
+     SetVariable(output, 'CMAKE_AR', ar)
+  if ranlib:
+    SetVariable(output, 'CMAKE_RANLIB', ranlib)
+  if nm:
+    SetVariable(output, 'CMAKE_NM', nm)
+   if cc:
+     SetVariable(output, 'CMAKE_C_COMPILER', cc)
+   if cxx:
 diff --git a/pylib/gyp/generator/xcode.py b/pylib/gyp/generator/xcode.py
-index db99d6a..8d56baf 100644
+index 8bc22bed..24bee427 100644
 --- a/pylib/gyp/generator/xcode.py
 +++ b/pylib/gyp/generator/xcode.py
-@@ -72,6 +72,10 @@ generator_additional_non_configuration_keys = [
+@@ -74,6 +74,12 @@ generator_additional_non_configuration_keys = [
   'ios_app_extension',
   'ios_watch_app',
   'ios_watchkit_extension',
 +
 +  'mac_sandbox', # sandbox support
 +  'mac_sandbox_development_team',
+
+  'mac_hardened_runtime', # hardened runtime support
 +
   'mac_bundle',
   'mac_bundle_resources',
   'mac_framework_headers',
-@@ -772,6 +776,26 @@ def GenerateOutput(target_list, target_dicts, data, params):
+@@ -774,6 +780,39 @@ def GenerateOutput(target_list, target_dicts, data, params):
     xcode_targets[qualified_target] = xct
     xcode_target_to_target_dict[xct] = spec
 
-+    # sandbox support
+    # sandbox and hardened runtime support
 +    is_sandbox = int(spec.get('mac_sandbox', 0))
+    is_hardened_runtime = int(spec.get('mac_hardened_runtime', 0))
+    if is_sandbox or is_hardened_runtime:
+      try:
+        tmp = pbxp._properties['attributes']['TargetAttributes']
+      except KeyError:
+        pbxp._properties['attributes']['TargetAttributes'] = {}
+      try:
+        tmp = pbxp._properties['attributes']['TargetAttributes'][xct]
+      except KeyError:
+        pbxp._properties['attributes']['TargetAttributes'][xct] = {}
+      try:
+        tmp = pbxp._properties['attributes']['TargetAttributes'][xct]['SystemCapabilities']
+      except KeyError:
+        pbxp._properties['attributes']['TargetAttributes'][xct]['SystemCapabilities'] = {}
+
 +    if is_sandbox:
 +      dev_team = spec.get('mac_sandbox_development_team', '%%ERROR%%')
 +      assert dev_team != '%%ERROR%%', (
 +          'mac_sandbox must be accompanied by mac_sandbox_development_team (target "%s")' %
 +          target_name)
-+      try:
-+        tmp =  pbxp._properties['attributes']['TargetAttributes']
-+      except KeyError:
-+        pbxp._properties['attributes']['TargetAttributes'] = {}
-+      pbxp._properties['attributes']['TargetAttributes'][xct] = {
-+        'DevelopmentTeam': dev_team,
-+        'SystemCapabilities': {
-+          'com.apple.Sandbox': {
-+            'enabled': 1,
-+          },
-+        },
+      pbxp._properties['attributes']['TargetAttributes'][xct]['DevelopmentTeam'] = dev_team
+      pbxp._properties['attributes']['TargetAttributes'][xct]['SystemCapabilities']['com.apple.Sandbox'] = {
+        'enabled': 1,
+      }
+
+    # hardened runtime support
+    if is_hardened_runtime:
+      pbxp._properties['attributes']['TargetAttributes'][xct]['SystemCapabilities']['com.apple.HardenedRuntime'] = {
+        'enabled': 1,
 +      }
 +
     spec_actions = spec.get('actions', [])
     spec_rules = spec.get('rules', [])
 
-@@ -1141,7 +1165,8 @@ exit 1
+@@ -1132,7 +1171,8 @@ exit 1
         groups = [x for x in groups if not x.endswith('_excluded')]
       for group in groups:
         for item in rule.get(group, []):
--- a/Telegram/Patches/macold/mini_chromium.diff
+++ b/Telegram/Patches/macold/mini_chromium.diff
@@ -1,8 +1,8 @@
 diff --git a/build/common.gypi b/build/common.gypi
-index 1affc70..c0d2f6a 100644
+index 1affc70..0677e4b 100644
 --- a/build/common.gypi
 +++ b/build/common.gypi
-@@ -66,6 +66,11 @@
+@@ -66,6 +66,13 @@
           'conditions': [
             ['clang!=0', {
               'CLANG_CXX_LANGUAGE_STANDARD': 'c++11',  # -std=c++11
@@ -10,11 +10,13 @@ index 1affc70..c0d2f6a 100644
 +              'OTHER_LDFLAGS': [
 +                '/usr/local/macold/lib/libc++.a',
 +                '/usr/local/macold/lib/libc++abi.a',
+                '-isysroot/',
+                '-L/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/lib/',
 +              ],
 
               # Don't link in libarclite_macosx.a, see http://crbug.com/156530.
               'CLANG_LINK_OBJC_RUNTIME': 'NO',      # -fno-objc-link-runtime
-@@ -116,6 +121,9 @@
+@@ -116,6 +123,9 @@
           ],
 
         },
--- a/Telegram/Patches/macold/qtbase_5_3_2.diff
+++ b/Telegram/Patches/macold/qtbase_5_3_2.diff
@@ -1,5 +1,5 @@
 diff --git a/configure b/configure
-index cb8d78fd3cb..cadb3f0a880 100755
+index cb8d78fd3c..cadb3f0a88 100755
 --- a/configure
 +++ b/configure
@@ -511,7 +511,8 @@ if [ "$BUILD_ON_MAC" = "yes" ]; then
@@ -13,7 +13,7 @@ index cb8d78fd3cb..cadb3f0a880 100755
         echo "   Xcode not set up properly. You may need to confirm the license" >&2
         echo "   agreement by running /usr/bin/xcodebuild without arguments." >&2
 diff --git a/mkspecs/common/g++-macx.conf b/mkspecs/common/g++-macx.conf
-index 086510dd963..c485967863d 100644
+index 086510dd96..078a5ed1dd 100644
 --- a/mkspecs/common/g++-macx.conf
 +++ b/mkspecs/common/g++-macx.conf
@@ -14,7 +14,13 @@ QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += -gdwarf-2
@@ -27,12 +27,12 @@ index 086510dd963..c485967863d 100644
 +# Patch: Use C++14 with custom libc++ build.
 +QMAKE_CXXFLAGS_CXX11 = -std=c++1y
 +QMAKE_CXXFLAGS += -nostdinc++ -I/usr/local/macold/include/c++/v1
-+QMAKE_LFLAGS += /usr/local/macold/lib/libc++.a /usr/local/macold/lib/libc++abi.a
+QMAKE_LFLAGS += /usr/local/macold/lib/libc++.a /usr/local/macold/lib/libc++abi.a -isysroot /
 
 QMAKE_XCODE_GCC_VERSION = com.apple.compilers.llvmgcc42
 
 diff --git a/mkspecs/features/mac/default_pre.prf b/mkspecs/features/mac/default_pre.prf
-index 0cc8cd6dfdd..ca9725b7791 100644
+index 0cc8cd6dfd..ca9725b779 100644
 --- a/mkspecs/features/mac/default_pre.prf
 +++ b/mkspecs/features/mac/default_pre.prf
@@ -12,7 +12,9 @@ isEmpty(QMAKE_XCODE_DEVELOPER_PATH) {
@@ -47,7 +47,7 @@ index 0cc8cd6dfdd..ca9725b7791 100644
 }
 
 diff --git a/src/gui/image/qbmphandler.cpp b/src/gui/image/qbmphandler.cpp
-index bb79a139b3c..5d595bc3b34 100644
+index bb79a139b3..5d595bc3b3 100644
 --- a/src/gui/image/qbmphandler.cpp
 +++ b/src/gui/image/qbmphandler.cpp
@@ -220,6 +220,10 @@ static bool read_dib_body(QDataStream &s, const BMP_INFOHDR &bi, int offset, int
@@ -74,7 +74,7 @@ index bb79a139b3c..5d595bc3b34 100644
     if (ncols > 0) {                                // read color table
         uchar rgb[4];
 diff --git a/src/gui/painting/qpaintengine_p.h b/src/gui/painting/qpaintengine_p.h
-index ebff9509ab2..4300ca4c0f0 100644
+index ebff9509ab..4300ca4c0f 100644
 --- a/src/gui/painting/qpaintengine_p.h
 +++ b/src/gui/painting/qpaintengine_p.h
@@ -87,8 +87,18 @@ public:
@@ -98,7 +98,7 @@ index ebff9509ab2..4300ca4c0f0 100644
 
         // Make sure we're inside the viewport.
 diff --git a/src/gui/text/qtextlayout.cpp b/src/gui/text/qtextlayout.cpp
-index 4879ae51d7d..56cdcbaf01c 100644
+index 4879ae51d7..56cdcbaf01 100644
 --- a/src/gui/text/qtextlayout.cpp
 +++ b/src/gui/text/qtextlayout.cpp
@@ -654,6 +654,9 @@ int QTextLayout::nextCursorPosition(int oldPos, CursorMode mode) const
@@ -175,7 +175,7 @@ index 4879ae51d7d..56cdcbaf01c 100644
 
         inline void resetRightBearing()
 diff --git a/src/gui/text/qtextlayout.h b/src/gui/text/qtextlayout.h
-index cbe42c38444..b273db7e78c 100644
+index cbe42c3844..b273db7e78 100644
 --- a/src/gui/text/qtextlayout.h
 +++ b/src/gui/text/qtextlayout.h
@@ -194,6 +194,9 @@ private:
@@ -189,7 +189,7 @@ index cbe42c38444..b273db7e78c 100644
 
 
 diff --git a/src/network/access/qhttpnetworkconnection.cpp b/src/network/access/qhttpnetworkconnection.cpp
-index 360f9722c70..f28f289ef6a 100644
+index 360f9722c7..f28f289ef6 100644
 --- a/src/network/access/qhttpnetworkconnection.cpp
 +++ b/src/network/access/qhttpnetworkconnection.cpp
@@ -118,6 +118,8 @@ QHttpNetworkConnectionPrivate::~QHttpNetworkConnectionPrivate()
@@ -202,7 +202,7 @@ index 360f9722c70..f28f289ef6a 100644
             delete channels[i].socket;
         }
 diff --git a/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase.mm b/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase.mm
-index ca7afb7d1b9..25ae50008db 100644
+index ca7afb7d1b..25ae50008d 100644
 --- a/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase.mm
 +++ b/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase.mm
@@ -256,6 +256,13 @@ static void getFontDescription(CTFontDescriptorRef font, FontDescription *fd)
@@ -220,7 +220,7 @@ index ca7afb7d1b9..25ae50008db 100644
     fd->weight = QFont::Normal;
     fd->style = QFont::StyleNormal;
 diff --git a/src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm b/src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm
-index 6e2c8a2a9af..3cace8abcbc 100644
+index 6e2c8a2a9a..3cace8abcb 100644
 --- a/src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm
 +++ b/src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm
@@ -717,7 +717,8 @@ void QCoreTextFontEngine::getUnscaledGlyph(glyph_t, QPainterPath *, glyph_metric
@@ -234,7 +234,7 @@ index 6e2c8a2a9af..3cace8abcbc 100644
 
 QFontEngine *QCoreTextFontEngine::cloneWithSize(qreal pixelSize) const
 diff --git a/src/plugins/platforms/cocoa/qcocoaapplicationdelegate.mm b/src/plugins/platforms/cocoa/qcocoaapplicationdelegate.mm
-index 92358ecc745..694fee73507 100644
+index 92358ecc74..694fee7350 100644
 --- a/src/plugins/platforms/cocoa/qcocoaapplicationdelegate.mm
 +++ b/src/plugins/platforms/cocoa/qcocoaapplicationdelegate.mm
@@ -213,7 +213,8 @@ static void cleanupCocoaApplicationDelegate()
@@ -271,7 +271,7 @@ index 92358ecc745..694fee73507 100644
 
 - (void)appleEventQuit:(NSAppleEventDescriptor *)event withReplyEvent:(NSAppleEventDescriptor *)replyEvent
 diff --git a/src/plugins/platforms/cocoa/qcocoacursor.mm b/src/plugins/platforms/cocoa/qcocoacursor.mm
-index b81b9a0b1c2..4e59e833b1d 100644
+index b81b9a0b1c..4e59e833b1 100644
 --- a/src/plugins/platforms/cocoa/qcocoacursor.mm
 +++ b/src/plugins/platforms/cocoa/qcocoacursor.mm
@@ -81,7 +81,7 @@ void QCocoaCursor::setPos(const QPoint &position)
@@ -284,7 +284,7 @@ index b81b9a0b1c2..4e59e833b1d 100644
     CFRelease(e);
 }
 diff --git a/src/plugins/platforms/cocoa/qcocoahelpers.mm b/src/plugins/platforms/cocoa/qcocoahelpers.mm
-index 9850f83dea8..b2e1d3dfda7 100644
+index 9850f83dea..b2e1d3dfda 100644
 --- a/src/plugins/platforms/cocoa/qcocoahelpers.mm
 +++ b/src/plugins/platforms/cocoa/qcocoahelpers.mm
@@ -649,9 +649,10 @@ OSStatus qt_mac_drawCGImage(CGContextRef inContext, const CGRect *inBounds, CGIm
@@ -317,7 +317,7 @@ index 9850f83dea8..b2e1d3dfda7 100644
 }
 
 diff --git a/src/plugins/platforms/cocoa/qcocoaintegration.mm b/src/plugins/platforms/cocoa/qcocoaintegration.mm
-index 9fd05a65ee9..dea60720e78 100644
+index 9fd05a65ee..dea60720e7 100644
 --- a/src/plugins/platforms/cocoa/qcocoaintegration.mm
 +++ b/src/plugins/platforms/cocoa/qcocoaintegration.mm
@@ -402,14 +402,24 @@ void QCocoaIntegration::updateScreens()
@@ -348,7 +348,7 @@ index 9fd05a65ee9..dea60720e78 100644
 
 QCocoaScreen *QCocoaIntegration::screenAtIndex(int index)
 diff --git a/src/plugins/platforms/cocoa/qcocoakeymapper.mm b/src/plugins/platforms/cocoa/qcocoakeymapper.mm
-index e46eaff6be3..c62db534a2d 100644
+index e46eaff6be..c62db534a2 100644
 --- a/src/plugins/platforms/cocoa/qcocoakeymapper.mm
 +++ b/src/plugins/platforms/cocoa/qcocoakeymapper.mm
@@ -382,6 +382,12 @@ bool QCocoaKeyMapper::updateKeyboard()
@@ -375,7 +375,7 @@ index e46eaff6be3..c62db534a2d 100644
     }
     return ret;
 diff --git a/src/plugins/platforms/cocoa/qcocoasystemtrayicon.mm b/src/plugins/platforms/cocoa/qcocoasystemtrayicon.mm
-index 83c960d9317..03ae9696afe 100755
+index 83c960d931..03ae9696af 100755
 --- a/src/plugins/platforms/cocoa/qcocoasystemtrayicon.mm
 +++ b/src/plugins/platforms/cocoa/qcocoasystemtrayicon.mm
@@ -102,7 +102,10 @@ QT_USE_NAMESPACE
@@ -543,7 +543,7 @@ index 83c960d9317..03ae9696afe 100755
 }
 @end
 diff --git a/src/plugins/platforms/cocoa/qcocoawindow.mm b/src/plugins/platforms/cocoa/qcocoawindow.mm
-index 4d0458a4aa2..3357a5ef817 100644
+index 4d0458a4aa..3357a5ef81 100644
 --- a/src/plugins/platforms/cocoa/qcocoawindow.mm
 +++ b/src/plugins/platforms/cocoa/qcocoawindow.mm
@@ -167,7 +167,8 @@ static bool isMouseEvent(NSEvent *ev)
@@ -606,7 +606,7 @@ index 4d0458a4aa2..3357a5ef817 100644
         [iconButton setImage:image];
         [image release];
 diff --git a/src/plugins/platforms/cocoa/qnsview.mm b/src/plugins/platforms/cocoa/qnsview.mm
-index a18ee7ff71d..1f91feb0ae8 100644
+index a18ee7ff71..1f91feb0ae 100644
 --- a/src/plugins/platforms/cocoa/qnsview.mm
 +++ b/src/plugins/platforms/cocoa/qnsview.mm
@@ -393,7 +393,9 @@ static NSString *_q_NSWindowDidChangeOcclusionStateNotification = nil;
@@ -675,7 +675,7 @@ index a18ee7ff71d..1f91feb0ae8 100644
     }
     return [super performKeyEquivalent:nsevent];
 diff --git a/src/tools/qlalr/lalr.cpp b/src/tools/qlalr/lalr.cpp
-index c68076477f3..e2a7aafa586 100644
+index c68076477f..e2a7aafa58 100644
 --- a/src/tools/qlalr/lalr.cpp
 +++ b/src/tools/qlalr/lalr.cpp
@@ -246,11 +246,13 @@ void Grammar::buildExtendedGrammar ()
@@ -715,7 +715,7 @@ index c68076477f3..e2a7aafa586 100644
                     continue;
 
 diff --git a/src/widgets/kernel/qwidget.cpp b/src/widgets/kernel/qwidget.cpp
-index 7396808442e..7178aecf800 100644
+index 7396808442..7178aecf80 100644
 --- a/src/widgets/kernel/qwidget.cpp
 +++ b/src/widgets/kernel/qwidget.cpp
@@ -4722,6 +4722,17 @@ void QWidget::render(QPainter *painter, const QPoint &targetOffset,
@@ -768,7 +768,7 @@ index 7396808442e..7178aecf800 100644
                 || (k->key() == Qt::Key_Tab && (k->modifiers() & Qt::ShiftModifier)))
                 res = focusNextPrevChild(false);
 diff --git a/src/widgets/styles/qmacstyle_mac.mm b/src/widgets/styles/qmacstyle_mac.mm
-index 0845a5eb02f..5735cb6b396 100644
+index 0845a5eb02..5735cb6b39 100644
 --- a/src/widgets/styles/qmacstyle_mac.mm
 +++ b/src/widgets/styles/qmacstyle_mac.mm
@@ -3667,9 +3667,11 @@ void QMacStyle::drawControl(ControlElement ce, const QStyleOption *opt, QPainter
@@ -786,7 +786,7 @@ index 0845a5eb02f..5735cb6b396 100644
             }
 
 diff --git a/src/widgets/util/qsystemtrayicon_qpa.cpp b/src/widgets/util/qsystemtrayicon_qpa.cpp
-index f98aeaf6782..00c0734129e 100644
+index f98aeaf678..00c0734129 100644
 --- a/src/widgets/util/qsystemtrayicon_qpa.cpp
 +++ b/src/widgets/util/qsystemtrayicon_qpa.cpp
@@ -99,13 +99,18 @@ void QSystemTrayIconPrivate::updateIcon_sys()
@@ -815,7 +815,7 @@ index f98aeaf6782..00c0734129e 100644
 }
 
 diff --git a/src/widgets/widgets/qwidgetlinecontrol.cpp b/src/widgets/widgets/qwidgetlinecontrol.cpp
-index 75f30599be4..980f2be1e93 100644
+index 75f30599be..980f2be1e9 100644
 --- a/src/widgets/widgets/qwidgetlinecontrol.cpp
 +++ b/src/widgets/widgets/qwidgetlinecontrol.cpp
@@ -1867,7 +1867,8 @@ void QWidgetLineControl::processKeyEvent(QKeyEvent* event)
@@ -829,7 +829,7 @@ index 75f30599be4..980f2be1e93 100644
 #ifndef QT_NO_COMPLETER
             complete(event->key());
 diff --git a/src/widgets/widgets/qwidgettextcontrol.cpp b/src/widgets/widgets/qwidgettextcontrol.cpp
-index 96438a0bdf7..b0b72064056 100644
+index 96438a0bdf..b0b7206405 100644
 --- a/src/widgets/widgets/qwidgettextcontrol.cpp
 +++ b/src/widgets/widgets/qwidgettextcontrol.cpp
@@ -1342,7 +1342,8 @@ void QWidgetTextControlPrivate::keyPressEvent(QKeyEvent *e)
--- a/Telegram/Patches/qtbase_5_6_2.diff
+++ b/Telegram/Patches/qtbase_5_6_2.diff
@@ -252,6 +252,61 @@ index 41834b21ae..8cdf4ab145 100644
                         if (value == WSAEADDRNOTAVAIL) {
                             setError(QAbstractSocket::NetworkError, AddressNotAvailableErrorString);
                             socketState = QAbstractSocket::UnconnectedState;
+diff --git a/src/platformsupport/cglconvenience/cglconvenience.mm b/src/platformsupport/cglconvenience/cglconvenience.mm
+index fb609ae485..7cca45ded4 100644
+--- a/src/platformsupport/cglconvenience/cglconvenience.mm
+++ b/src/platformsupport/cglconvenience/cglconvenience.mm
+@@ -128,7 +128,12 @@ void *qcgl_createNSOpenGLPixelFormat(const QSurfaceFormat &format)
+     if (format.stereo())
+         attrs << NSOpenGLPFAStereo;
+ 
+-    attrs << NSOpenGLPFAAllowOfflineRenderers;
+    // Patch: Fix macOS regression. On 10.14.4, it crashes on GPU switches.
+    // See https://bugreports.qt.io/browse/QTCREATORBUG-22215
+    static const QAppleOperatingSystemVersion version = qt_apple_os_version();
+    if (!(version.major == 10 && version.minor == 14 && version.patch == 4))
+        attrs << NSOpenGLPFAAllowOfflineRenderers;
+    }
+ 
+     QByteArray useLayer = qgetenv("QT_MAC_WANTS_LAYER");
+     if (!useLayer.isEmpty() && useLayer.toInt() > 0) {
+diff --git a/src/platformsupport/dbustray/qdbustrayicon.cpp b/src/platformsupport/dbustray/qdbustrayicon.cpp
+index 4d6e70720d..9bdb0beb67 100644
+--- a/src/platformsupport/dbustray/qdbustrayicon.cpp
+++ b/src/platformsupport/dbustray/qdbustrayicon.cpp
+@@ -58,9 +58,18 @@ QT_BEGIN_NAMESPACE
+ 
+ Q_LOGGING_CATEGORY(qLcTray, "qt.qpa.tray")
+ 
+static QString cachePath()
+{
+    QString xdgCache = QString::fromUtf8(getenv("XDG_CACHE_HOME"));
+    if (xdgCache.isEmpty()) {
+        xdgCache = QDir::cleanPath(QDir::homePath() + QStringLiteral("/.cache"));
+    }
+    return xdgCache;
+}
+
+ static const QString KDEItemFormat = QStringLiteral("org.kde.StatusNotifierItem-%1-%2");
+ static const QString KDEWatcherService = QStringLiteral("org.kde.StatusNotifierWatcher");
+-static const QString TempFileTemplate =  QDir::tempPath() + QStringLiteral("/qt-trayicon-XXXXXX.png");
+static const QString TempFileTemplate = cachePath() + QStringLiteral("/qt-trayicon-XXXXXX.png");
+ static const QString XdgNotificationService = QStringLiteral("org.freedesktop.Notifications");
+ static const QString XdgNotificationPath = QStringLiteral("/org/freedesktop/Notifications");
+ static const QString DefaultAction = QStringLiteral("default");
+@@ -151,6 +160,12 @@ QTemporaryFile *QDBusTrayIcon::tempIcon(const QIcon &icon)
+         uint pid = session.interface()->servicePid(KDEWatcherService).value();
+         QString processName = QLockFilePrivate::processNameByPid(pid);
+         necessary = processName.endsWith(QStringLiteral("indicator-application-service"));
+        if (!necessary) {
+            QString xdgDesktop = QString::fromUtf8(getenv("XDG_CURRENT_DESKTOP"));
+            QStringList desktops = xdgDesktop.toLower().split(QLatin1Char(':'));
+            necessary = desktops.contains(QStringLiteral("unity")) ||
+                        desktops.contains(QStringLiteral("ubuntu"));
+        }
+         necessity_checked = true;
+     }
+     if (!necessary)
 diff --git a/src/platformsupport/fontdatabases/basic/qbasicfontdatabase.cpp b/src/platformsupport/fontdatabases/basic/qbasicfontdatabase.cpp
 index 728b166b71..1dc64593e1 100644
 --- a/src/platformsupport/fontdatabases/basic/qbasicfontdatabase.cpp
@@ -413,7 +468,7 @@ index 8ebabf3419..7bb8abd0d0 100644
         }
         populateFromPattern(pattern);
 diff --git a/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase.mm b/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase.mm
-index 566abf2126..5b9c714ffa 100644
+index 566abf2126..5c5fde9813 100644
 --- a/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase.mm
 +++ b/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase.mm
@@ -265,6 +265,13 @@ static void getFontDescription(CTFontDescriptorRef font, FontDescription *fd)
@@ -430,6 +485,20 @@ index 566abf2126..5b9c714ffa 100644
     fd->styleName = (CFStringRef)CTFontDescriptorCopyAttribute(font, kCTFontStyleNameAttribute);
     fd->weight = QFont::Normal;
     fd->style = QFont::StyleNormal;
+@@ -300,9 +307,10 @@ static void getFontDescription(CTFontDescriptorRef font, FontDescription *fd)
+ 
+     if (styles) {
+         if (CFNumberRef weightValue = (CFNumberRef) CFDictionaryGetValue(styles, kCTFontWeightTrait)) {
+-            float normalizedWeight;
+-            if (CFNumberGetValue(weightValue, kCFNumberFloatType, &normalizedWeight))
+-                fd->weight = QCoreTextFontEngine::qtWeightFromCFWeight(normalizedWeight);
+            // Patch: backport bugfix from 'b64ea4a3ab' commit.
+            double normalizedWeight;
+            if (CFNumberGetValue(weightValue, kCFNumberFloat64Type, &normalizedWeight))
+                fd->weight = QCoreTextFontEngine::qtWeightFromCFWeight(float(normalizedWeight));
+         }
+         if (CFNumberRef italic = (CFNumberRef) CFDictionaryGetValue(styles, kCTFontSlantTrait)) {
+             double d;
 diff --git a/src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm b/src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm
 index 7b459584ea..2ed2fd9b3b 100644
 --- a/src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm
@@ -476,7 +545,7 @@ index d1bea9af23..36a15a6473 100644
     event.setCommitString(QChar(character));
     QCoreApplication::sendEvent(m_focusObject, &event);
 diff --git a/src/plugins/platforminputcontexts/platforminputcontexts.pro b/src/plugins/platforminputcontexts/platforminputcontexts.pro
-index faea54b874..0f9650996e 100644
+index faea54b874..fe4a837511 100644
 --- a/src/plugins/platforminputcontexts/platforminputcontexts.pro
 +++ b/src/plugins/platforminputcontexts/platforminputcontexts.pro
@@ -1,7 +1,8 @@
@@ -484,8 +553,8 @@ index faea54b874..0f9650996e 100644
 
 qtHaveModule(dbus) {
 -!mac:!win32:SUBDIRS += ibus
-+# Patch: Adding fcitx/hime input context plugin to our static build.
-+!mac:!win32:SUBDIRS += ibus fcitx hime
+# Patch: Adding fcitx/hime/nimf input context plugin to our static build.
+!mac:!win32:SUBDIRS += ibus fcitx hime nimf
 }
 
 contains(QT_CONFIG, xcb-plugin): SUBDIRS += compose
@@ -630,7 +699,7 @@ index c2d206fb45..9b9739862d 100644
     }
     return ret;
 diff --git a/src/plugins/platforms/cocoa/qcocoasystemtrayicon.mm b/src/plugins/platforms/cocoa/qcocoasystemtrayicon.mm
-index 8152c57ffd..5ddd7b353d 100644
+index 8152c57ffd..87ba2f3f72 100644
 --- a/src/plugins/platforms/cocoa/qcocoasystemtrayicon.mm
 +++ b/src/plugins/platforms/cocoa/qcocoasystemtrayicon.mm
@@ -94,6 +94,8 @@ QT_USE_NAMESPACE
@@ -746,7 +815,19 @@ index 8152c57ffd..5ddd7b353d 100644
         systray = sys;
         imageCell = [[QNSImageView alloc] initWithParent:self];
         [item setView: imageCell];
-@@ -482,6 +513,10 @@ QT_END_NAMESPACE
+@@ -448,6 +479,11 @@ QT_END_NAMESPACE
+ -(void)dealloc {
+     [[NSStatusBar systemStatusBar] removeStatusItem:item];
+     [[NSNotificationCenter defaultCenter] removeObserver:imageCell];
+
+    // Patch: Fix crash in macOS 10.14.
+    // Somehow item and imageCell are retained and attempt to be drawn if left in view.
+    [item setView: nil];
+
+     [imageCell release];
+     [item release];
+     [super dealloc];
+@@ -482,6 +518,10 @@ QT_END_NAMESPACE
          selector:@selector(menuTrackingDone:)
              name:NSMenuDidEndTrackingNotification
                  object:m];
@@ -820,7 +901,7 @@ index c0d5904367..f3c2047196 100644
         [iconButton setImage:image];
         [image release];
 diff --git a/src/plugins/platforms/cocoa/qnsview.mm b/src/plugins/platforms/cocoa/qnsview.mm
-index c67bcfd23b..2616f420cb 100644
+index c67bcfd23b..6a60670aee 100644
 --- a/src/plugins/platforms/cocoa/qnsview.mm
 +++ b/src/plugins/platforms/cocoa/qnsview.mm
@@ -647,6 +647,12 @@ QT_WARNING_POP
@@ -894,6 +975,17 @@ index c67bcfd23b..2616f420cb 100644
 - (void)cancelOperation:(id)sender
 {
     Q_UNUSED(sender);
+@@ -1981,6 +2006,10 @@ static QPoint mapWindowCoordinates(QWindow *source, QWindow *target, QPoint poin
+     // change the cursor
+     [nativeCursor set];
+ 
+    // Patch: Backport a fix from cd08753d3e. Starting with macOS Mojave this requires accessibility access.
+    if (QSysInfo::macVersion() >= Q_MV_OSX(10, 14))
+        return;
+
+     // Make sure the cursor is updated correctly if the mouse does not move and window is under cursor
+     // by creating a fake move event
+     if (m_updatingDrag)
 diff --git a/src/plugins/platforms/windows/qwindowsdialoghelpers.cpp b/src/plugins/platforms/windows/qwindowsdialoghelpers.cpp
 index 94bb71e429..16ab51e166 100644
 --- a/src/plugins/platforms/windows/qwindowsdialoghelpers.cpp
--- a/Telegram/Resources/art/emoji.webp
+++ b/Telegram/Resources/art/emoji.webp
--- a/Telegram/Resources/art/emoji_125x.webp
+++ b/Telegram/Resources/art/emoji_125x.webp
--- a/Telegram/Resources/art/emoji_150x.webp
+++ b/Telegram/Resources/art/emoji_150x.webp
--- a/Telegram/Resources/art/emoji_200x.webp
+++ b/Telegram/Resources/art/emoji_200x.webp
--- a/Telegram/Resources/art/emoji_250x.webp
+++ b/Telegram/Resources/art/emoji_250x.webp
--- a/Telegram/Resources/basic.style
+++ b/Telegram/Resources/basic.style
@@ -92,7 +92,7 @@ msgServiceFont: semiboldFont;
 msgServiceNameFont: semiboldFont;
 msgServicePhotoWidth: 100px;
 msgDateFont: font(13px);
-msgMinWidth: 190px;
+msgMinWidth: 160px;
 msgPhotoSize: 33px;
 msgPhotoSkip: 40px;
 msgPadding: margins(13px, 7px, 13px, 8px);
@@ -172,6 +172,21 @@ inFwdTextPaletteSelected: TextPalette(defaultTextPalette) {
 outFwdTextPaletteSelected: TextPalette(defaultTextPalette) {
 	linkFg: msgOutServiceFgSelected;
 }
+inReplyTextPalette: TextPalette(inTextPalette) {
+	linkFg: msgInDateFg;
+}
+inReplyTextPaletteSelected: TextPalette(inTextPaletteSelected) {
+	linkFg: msgInDateFgSelected;
+}
+outReplyTextPalette: TextPalette(outTextPalette) {
+	linkFg: msgOutDateFg;
+}
+outReplyTextPaletteSelected: TextPalette(outTextPaletteSelected) {
+	linkFg: msgOutDateFgSelected;
+}
+imgReplyTextPalette: TextPalette(defaultTextPalette) {
+	linkFg: msgImgReplyBarColor;
+}
 inSemiboldPalette: TextPalette(inTextPalette) {
 	linkFg: msgInServiceFg;
 	selectFg: msgInServiceFgSelected;
@@ -182,6 +197,9 @@ outSemiboldPalette: TextPalette(outTextPalette) {
 	selectFg: msgOutServiceFgSelected;
 	selectLinkFg: msgOutServiceFgSelected;
 }
+historyComposeAreaPalette: TextPalette(defaultTextPalette) {
+	linkFg: historyComposeAreaFgService;
+}

 mediaCaptionSkip: 5px;
 mediaInBubbleSkip: 5px;
@@ -225,12 +243,6 @@ dragPadding: margins(20px, 10px, 20px, 10px);

 dragHeight: 72px;

-minPhotoSize: 100px;
-maxMediaSize: 430px;
-maxStickerSize: 256px;
-maxGifSize: 320px;
-maxSignatureSize: 144px;
-
 radialSize: size(50px, 50px);
 radialLine: 3px;
 radialDuration: 350;
@@ -246,19 +258,6 @@ videoIcon: icon {
 };
 locationSize: size(320px, 240px);

-webPageLeft: 10px;
-webPageBar: 2px;
-webPageTitleFont: semiboldFont;
-webPageTitleStyle: semiboldTextStyle;
-webPageTitleOutFg: historyTextOutFg;
-webPageTitleInFg: historyTextInFg;
-webPageDescriptionOutFg: historyTextOutFg;
-webPageDescriptionInFg: historyTextInFg;
-webPageDescriptionFont: normalFont;
-webPageDescriptionStyle: defaultTextStyle;
-webPagePhotoSize: 100px;
-webPagePhotoDelta: 8px;
-
 mediaPlayerSuppressDuration: 150;

 botDescSkip: 8px;
@@ -295,4 +294,7 @@ notifyFadeRight: icon {{ "fade_horizontal", notificationBg }};
 stickerIconLeft: icon {{ "fade_horizontal-flip_horizontal", emojiPanCategories }};
 stickerIconRight: icon {{ "fade_horizontal", emojiPanCategories }};

+emojiSuggestionsFadeLeft: icon {{ "fade_horizontal-flip_horizontal", boxBg }};
+emojiSuggestionsFadeRight: icon {{ "fade_horizontal", boxBg }};
+
 transparentPlaceholderSize: 4px;
--- a/Telegram/Resources/colors.palette
+++ b/Telegram/Resources/colors.palette
@@ -193,6 +193,7 @@ dialogsSentIconFg: #5dc452; // chat list sent message tick / double tick icon
 dialogsUnreadBg: windowBgActive; // chat list unread badge background for not muted chat
 dialogsUnreadBgMuted: #bbbbbb; // chat list unread badge background for muted chat
 dialogsUnreadFg: windowFgActive; // chat list unread badge text
+dialogsArchiveFg: #525252 | dialogsNameFg; // chat list archive name text

 dialogsBgOver: windowBgOver; // chat list background with mouse over
 dialogsNameFgOver: windowBoldFgOver; // chat list name text with mouse over
@@ -208,6 +209,7 @@ dialogsSentIconFgOver: dialogsSentIconFg; // chat list sent message tick / doubl
 dialogsUnreadBgOver: dialogsUnreadBg; // chat list unread badge background for not muted chat with mouse over
 dialogsUnreadBgMutedOver: dialogsUnreadBgMuted; // chat list unread badge background for muted chat with mouse over
 dialogsUnreadFgOver: dialogsUnreadFg; // chat list unread badge text with mouse over
+dialogsArchiveFgOver: #525252 | dialogsNameFgOver; // chat list archive name text

 dialogsBgActive: #419fd9; // chat list background for current (active) chat
 dialogsNameFgActive: windowFgActive; // chat list name text for current (active) chat
@@ -304,6 +306,7 @@ historyPeer8NameFgSelected: historyPeer8NameFg; // orange group member name in a
 historyPeer8UserpicBg: #faa774; // orange userpic background
 historyPeerUserpicFg: windowFgActive; // default userpic initials
 historyPeerSavedMessagesBg: historyPeer4UserpicBg; // saved messages userpic background
+historyPeerArchiveUserpicBg: dialogsUnreadBgMuted; // archive folder userpic background

 // Some values are marked as (adjusted), it means they're adjusted by
 // hue and saturation of the average background color if user chooses
@@ -444,6 +447,9 @@ historyComposeButtonBg: historyComposeAreaBg; // unblock / join channel / mute c
 historyComposeButtonBgOver: windowBgOver; // unblock / join channel / mute channel button background with mouse over
 historyComposeButtonBgRipple: windowBgRipple; // unblock / join channel / mute channel button ripple effect

+mapPointDrop: #fd4444; // geo location marker background
+mapPointDot: #ffffff; // geo location marker point
+
 // overview
 overviewCheckBg: #00000040; // shared media / files / links checkbox background for not selected rows when some rows are selected
 overviewCheckBgActive: windowBgActive; // shared media / files / links checkbox background for selected rows
--- a/Telegram/Resources/day-blue.tdesktop-theme
+++ b/Telegram/Resources/day-blue.tdesktop-theme
--- a/Telegram/Resources/default_shortcuts-custom.json
+++ b/Telegram/Resources/default_shortcuts-custom.json
@@ -0,0 +1,14 @@
+// This is a list of your own shortcuts for Telegram Desktop
+// You can see full list of commands in the 'shortcuts-default.json' file
+// Place a null value instead of a command string to switch the shortcut off
+
+[
+    // {
+    //     "command": "close_telegram",
+    //     "keys": "ctrl+f4"
+    // },
+    // {
+    //     "command": "quit_telegram",
+    //     "keys": "ctrl+q"
+    // }
+]
--- a/Telegram/Resources/emoji/emoji_1.webp
+++ b/Telegram/Resources/emoji/emoji_1.webp
--- a/Telegram/Resources/emoji/emoji_2.webp
+++ b/Telegram/Resources/emoji/emoji_2.webp
--- a/Telegram/Resources/emoji/emoji_3.webp
+++ b/Telegram/Resources/emoji/emoji_3.webp
--- a/Telegram/Resources/emoji/emoji_4.webp
+++ b/Telegram/Resources/emoji/emoji_4.webp
--- a/Telegram/Resources/emoji/emoji_5.webp
+++ b/Telegram/Resources/emoji/emoji_5.webp
--- a/Telegram/Resources/emoji/set0_preview.webp
+++ b/Telegram/Resources/emoji/set0_preview.webp
--- a/Telegram/Resources/emoji/set1_preview.webp
+++ b/Telegram/Resources/emoji/set1_preview.webp
--- a/Telegram/Resources/emoji/set2_preview.webp
+++ b/Telegram/Resources/emoji/set2_preview.webp
--- a/Telegram/Resources/emoji/set3_preview.webp
+++ b/Telegram/Resources/emoji/set3_preview.webp
--- a/Telegram/Resources/export_html/css/style.css
+++ b/Telegram/Resources/export_html/css/style.css
@@ -0,0 +1,531 @@
+body {
+    margin: 0;
+    font: 12px/18px 'Open Sans',"Lucida Grande","Lucida Sans Unicode",Arial,Helvetica,Verdana,sans-serif;
+}
+strong {
+    font-weight: 700;
+}
+code, kbd, pre, samp {
+    font-family: Menlo,Monaco,Consolas,"Courier New",monospace;
+}
+code {
+    padding: 2px 4px;
+    font-size: 90%;
+    color: #c7254e;
+    background-color: #f9f2f4;
+    border-radius: 4px;
+}
+pre {
+    display: block;
+    margin: 0;
+    line-height: 1.42857143;
+    word-break: break-all;
+    word-wrap: break-word;
+    color: #333;
+    background-color: #f5f5f5;
+    border-radius: 4px;
+    overflow: auto;
+    padding: 3px;
+    border: 1px solid #eee;
+    max-height: none;
+    font-size: inherit;
+}
+.clearfix:after {
+    content: " ";
+    visibility: hidden;
+    display: block;
+    height: 0;
+    clear: both;
+}
+.pull_left {
+    float: left;
+}
+.pull_right {
+    float: right;
+}
+.page_wrap {
+    background-color: #ffffff;
+    color: #000000;
+}
+.page_wrap a {
+    color: #168acd;
+    text-decoration: none;
+}
+.page_wrap a:hover {
+    text-decoration: underline;
+}
+.page_header {
+    position: fixed;
+    z-index: 10;
+    background-color: #ffffff;
+    width: 100%;
+    border-bottom: 1px solid #e3e6e8;
+}
+.page_header .content {
+    width: 480px;
+    margin: 0 auto;
+    border-radius: 0 !important;
+}
+.page_header a.content {
+    background-repeat: no-repeat;
+    background-position: 24px 21px;
+    background-size: 24px 24px;
+}
+.bold {
+    color: #212121;
+    font-weight: 700;
+}
+.details {
+    color: #70777b;
+}
+.page_header .content .text {
+    padding: 24px 24px 22px 24px;
+    font-size: 22px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+}
+.page_header a.content .text {
+    padding: 24px 24px 22px 82px;
+}
+.page_body {
+    padding-top: 64px;
+    width: 480px;
+    margin: 0 auto;
+}
+.page_about {
+    padding: 24px 24px;
+}
+.with_divider {
+    border-top: 1px solid #e3e6e8;
+}
+.userpic_link {
+    display: block;
+    text-decoration: none;
+}
+.userpic_link:hover {
+    text-decoration: none;
+}
+.userpic {
+    display: block;
+    border-radius: 50%;
+    overflow: hidden;
+}
+.userpic .initials {
+    display: block;
+    color: #fff;
+    text-align: center;
+    text-transform: uppercase;
+    user-select: none;
+}
+.color_red,
+.userpic1,
+.media_call .fill,
+.media_file .fill,
+.media_live_location .fill {
+    background-color: #ff5555;
+}
+.color_green,
+.userpic2,
+.media_call.success .fill,
+.media_photo .fill {
+    background-color: #64bf47;
+}
+.color_yellow,
+.userpic3,
+.media_venue .fill {
+    background-color: #ffab00;
+}
+.color_blue,
+.userpic4,
+.media_audio_file .fill,
+.media_voice_message .fill {
+    background-color: #4f9cd9;
+}
+.color_purple,
+.userpic5,
+.media_game .fill {
+    background-color: #9884e8;
+}
+.color_pink,
+.userpic6,
+.media_invoice .fill {
+    background-color: #e671a5;
+}
+.color_sea,
+.userpic7,
+.media_location .fill,
+.media_video .fill {
+    background-color: #47bcd1;
+}
+.color_orange,
+.userpic8,
+.media_contact .fill {
+    background-color: #ff8c44;
+}
+.personal_info {
+    padding: 24px;
+}
+.personal_info .userpic .initials {
+    font-size: 30px;
+}
+.personal_info .rows {
+    float: left;
+    padding-right: 24px;
+}
+.personal_info .names {
+    width: 164px;
+}
+.personal_info .info {
+    width: 124px;
+}
+.personal_info .bio {
+    width: 400px;
+}
+.personal_info .row {
+    padding-bottom: 16px;
+}
+a.block_link {
+    display: block;
+    text-decoration: none !important;
+    border-radius: 4px;
+}
+a.block_link:hover {
+    text-decoration: none !important;
+    background-color: #f5f7f8;
+}
+.sections {
+    padding: 11px 0;
+}
+.section {
+    height: 48px;
+    background-position: 24px 12px;
+    background-repeat: no-repeat;
+    background-size: 24px 24px;
+}
+.section .counter {
+    float: right;
+    padding: 14px 24px 0;
+    font-size: 15px;
+}
+.section .label {
+    padding: 15px 0 0 82px;
+    font-size: 15px;
+}
+.list_page .page_about {
+    padding: 16px 24px 0;
+    font-size: 11px;
+}
+.list_page .entry_list {
+    padding: 16px 0;
+}
+.list_page .entry {
+    padding: 10px 16px;
+}
+.list_page .entry .userpic .initials {
+    font-size: 18px;
+}
+.list_page .entry .body {
+    margin-left: 66px;
+}
+.list_page .entry .name {
+    padding: 4px 0 2px;
+    font-size: 14px;
+}
+.list_page .entry .subname {
+    padding-top: 4px;
+}
+.list_page .entry .details_entry {
+    padding-top: 4px;
+}
+.list_page .entry .info {
+    font-size: 11px;
+    padding-top: 5px;
+}
+.history {
+    padding: 16px 0;
+}
+.message {
+    margin: 0 -10px;
+    transition: background-color 2.0s ease;
+}
+div.selected {
+    background-color: rgba(242,246,250,255);
+    transition: background-color 0.5s ease;
+}
+.service {
+    padding: 10px 24px;
+}
+.service .body {
+    text-align: center;
+}
+.service .userpic_wrap {
+    padding-top: 10px;
+}
+.service .userpic {
+    margin: 0 auto;
+}
+.service .userpic .initials {
+    font-size: 24px;
+}
+.message .userpic .initials {
+    font-size: 16px;
+}
+.default {
+    padding: 10px;
+}
+.default.joined {
+    margin-top: -10px;
+}
+.default .from_name {
+    color: #3892db;
+    font-weight: 700;
+    padding-bottom: 5px;
+}
+.default .from_name .details {
+    font-weight: normal;
+}
+.default .body {
+    margin-left: 60px;
+}
+.default .text {
+    word-wrap: break-word;
+    line-height: 150%;
+}
+.default .reply_to,
+.default .media_wrap {
+    padding-bottom: 5px;
+}
+.default .media {
+    margin: 0 -10px;
+    padding: 5px 10px;
+}
+.default .media .fill,
+.default .media .thumb {
+    width: 48px;
+    height: 48px;
+    border-radius: 50%;
+}
+.default .media .fill {
+    background-repeat: no-repeat;
+    background-position: 12px 12px;
+    background-size: 24px 24px;
+}
+.default .media .title,
+.default .media_poll .question {
+    padding-top: 4px;
+    font-size: 14px;
+}
+.default .media .description {
+    color: #000000;
+    padding-top: 4px;
+    font-size: 13px;
+}
+.default .media .status {
+    padding-top: 4px;
+    font-size: 13px;
+}
+.default .video_file_wrap,
+.default .animated_wrap {
+    position: relative;
+}
+.default .video_file,
+.default .animated,
+.default .photo,
+.default .sticker {
+    display: block;
+}
+.video_duration {
+    background: rgba(0, 0, 0, .4);
+    padding: 0px 5px;
+    position: absolute;
+    z-index: 2;
+    border-radius: 2px;
+    right: 3px;
+    bottom: 3px;
+    color: #ffffff;
+    font-size: 11px;
+}
+.video_play_bg {
+    background: rgba(0, 0, 0, .4);
+    width: 40px;
+    height: 40px;
+    line-height: 0;
+    position: absolute;
+    z-index: 2;
+    border-radius: 50%;
+    overflow: hidden;
+    margin: -20px auto 0 -20px;
+    top: 50%;
+    left: 50%;
+    pointer-events: none;
+}
+.video_play {
+    position: absolute;
+    display: inline-block;
+    top: 50%;
+    left: 50%;
+    margin-left: -5px;
+    margin-top: -9px;
+    z-index: 1;
+    width: 0;
+    height: 0;
+    border-style: solid;
+    border-width: 9px 0 9px 14px;
+    border-color: transparent transparent transparent #fff;
+}
+.gif_play {
+    font-weight: 700;
+    color: #FFF;
+    display: block;
+    line-height: 40px;
+    font-size: 13px;
+    text-align: center;
+}
+.pagination {
+    text-align: center;
+    padding: 20px;
+    font-size: 16px;
+}
+
+.toast_container {
+    position: fixed;
+    left: 50%;
+    top: 50%;
+    opacity: 0;
+    transition: opacity 3.0s ease;
+}
+.toast_body {
+    margin: 0 -50%;
+    float: left;
+    border-radius: 15px;
+    padding: 10px 20px;
+    background: rgba(0, 0, 0, 0.7);
+    color: #ffffff;
+}
+div.toast_shown {
+    opacity: 1;
+    transition: opacity 0.4s ease;
+}
+
+.section.calls {
+    background-image: url(../images/section_calls.png);
+}
+.section.chats {
+    background-image: url(../images/section_chats.png);
+}
+.section.contacts {
+    background-image: url(../images/section_contacts.png);
+}
+.section.frequent {
+    background-image: url(../images/section_frequent.png);
+}
+.section.photos {
+    background-image: url(../images/section_photos.png);
+}
+.section.sessions {
+    background-image: url(../images/section_sessions.png);
+}
+.section.web {
+    background-image: url(../images/section_web.png);
+}
+.section.other {
+    background-image: url(../images/section_other.png)
+}
+.page_header a.content {
+    background-image: url(../images/back.png);
+}
+.media_call .fill {
+    background-image: url(../images/media_call.png)
+}
+.media_contact .fill {
+    background-image: url(../images/media_contact.png)
+}
+.media_file .fill {
+    background-image: url(../images/media_file.png)
+}
+.media_game .fill {
+    background-image: url(../images/media_game.png)
+}
+.media_live_location .fill,
+.media_location .fill,
+.media_venue .fill {
+    background-image: url(../images/media_location.png)
+}
+.media_audio_file .fill {
+    background-image: url(../images/media_music.png)
+}
+.media_invoice .fill {
+    background-image: url(../images/media_shop.png)
+}
+.media_voice_message .fill {
+    background-image: url(../images/media_voice.png)
+}
+.media_photo .fill {
+    background-image: url(../images/media_photo.png)
+}
+.media_video .fill {
+    background-image: url(../images/media_video.png)
+}
+
+@media only screen and (min--moz-device-pixel-ratio: 2), only screen and (-o-min-device-pixel-ratio: 2/1), only screen and (-webkit-min-device-pixel-ratio: 2), only screen and (min-device-pixel-ratio: 2) {
+.section.calls {
+    background-image: url(../images/section_calls@2x.png);
+}
+.section.chats {
+    background-image: url(../images/section_chats@2x.png);
+}
+.section.contacts {
+    background-image: url(../images/section_contacts@2x.png);
+}
+.section.frequent {
+    background-image: url(../images/section_frequent@2x.png);
+}
+.section.photos {
+    background-image: url(../images/section_photos@2x.png);
+}
+.section.sessions {
+    background-image: url(../images/section_sessions@2x.png);
+}
+.section.web {
+    background-image: url(../images/section_web@2x.png);
+}
+.section.other {
+    background-image: url(../images/section_other@2x.png);
+}
+.page_header a.content {
+    background-image: url(../images/back@2x.png);
+}
+.media_call .fill {
+    background-image: url(../images/media_call@2x.png)
+}
+.media_contact .fill {
+    background-image: url(../images/media_contact@2x.png)
+}
+.media_file .fill {
+    background-image: url(../images/media_file@2x.png)
+}
+.media_game .fill {
+    background-image: url(../images/media_game@2x.png)
+}
+.media_live_location .fill,
+.media_location .fill,
+.media_venue .fill {
+    background-image: url(../images/media_location@2x.png)
+}
+.media_audio_file .fill {
+    background-image: url(../images/media_music@2x.png)
+}
+.media_invoice .fill {
+    background-image: url(../images/media_shop@2x.png)
+}
+.media_voice_message .fill {
+    background-image: url(../images/media_voice@2x.png)
+}
+.media_photo .fill {
+    background-image: url(../images/media_photo@2x.png)
+}
+.media_video .fill {
+    background-image: url(../images/media_video@2x.png)
+}
+}
--- a/Telegram/Resources/export_html/images/back.png
+++ b/Telegram/Resources/export_html/images/back.png
--- a/Telegram/Resources/export_html/images/back@2x.png
+++ b/Telegram/Resources/export_html/images/back@2x.png
--- a/Telegram/Resources/export_html/images/media_call.png
+++ b/Telegram/Resources/export_html/images/media_call.png
--- a/Telegram/Resources/export_html/images/media_call@2x.png
+++ b/Telegram/Resources/export_html/images/media_call@2x.png
--- a/Telegram/Resources/export_html/images/media_contact.png
+++ b/Telegram/Resources/export_html/images/media_contact.png
--- a/Telegram/Resources/export_html/images/media_contact@2x.png
+++ b/Telegram/Resources/export_html/images/media_contact@2x.png
--- a/Telegram/Resources/export_html/images/media_file.png
+++ b/Telegram/Resources/export_html/images/media_file.png
--- a/Telegram/Resources/export_html/images/media_file@2x.png
+++ b/Telegram/Resources/export_html/images/media_file@2x.png
--- a/Telegram/Resources/export_html/images/media_game.png
+++ b/Telegram/Resources/export_html/images/media_game.png
--- a/Telegram/Resources/export_html/images/media_game@2x.png
+++ b/Telegram/Resources/export_html/images/media_game@2x.png
--- a/Telegram/Resources/export_html/images/media_location.png
+++ b/Telegram/Resources/export_html/images/media_location.png
--- a/Telegram/Resources/export_html/images/media_location@2x.png
+++ b/Telegram/Resources/export_html/images/media_location@2x.png
--- a/Telegram/Resources/export_html/images/media_music.png
+++ b/Telegram/Resources/export_html/images/media_music.png
--- a/Telegram/Resources/export_html/images/media_music@2x.png
+++ b/Telegram/Resources/export_html/images/media_music@2x.png
--- a/Telegram/Resources/export_html/images/media_photo.png
+++ b/Telegram/Resources/export_html/images/media_photo.png
--- a/Telegram/Resources/export_html/images/media_photo@2x.png
+++ b/Telegram/Resources/export_html/images/media_photo@2x.png
--- a/Telegram/Resources/export_html/images/media_shop.png
+++ b/Telegram/Resources/export_html/images/media_shop.png
--- a/Telegram/Resources/export_html/images/media_shop@2x.png
+++ b/Telegram/Resources/export_html/images/media_shop@2x.png
--- a/Telegram/Resources/export_html/images/media_video.png
+++ b/Telegram/Resources/export_html/images/media_video.png
--- a/Telegram/Resources/export_html/images/media_video@2x.png
+++ b/Telegram/Resources/export_html/images/media_video@2x.png
--- a/Telegram/Resources/export_html/images/media_voice.png
+++ b/Telegram/Resources/export_html/images/media_voice.png
--- a/Telegram/Resources/export_html/images/media_voice@2x.png
+++ b/Telegram/Resources/export_html/images/media_voice@2x.png
--- a/Telegram/Resources/export_html/images/section_calls.png
+++ b/Telegram/Resources/export_html/images/section_calls.png
--- a/Telegram/Resources/export_html/images/section_calls@2x.png
+++ b/Telegram/Resources/export_html/images/section_calls@2x.png
--- a/Telegram/Resources/export_html/images/section_chats.png
+++ b/Telegram/Resources/export_html/images/section_chats.png
--- a/Telegram/Resources/export_html/images/section_chats@2x.png
+++ b/Telegram/Resources/export_html/images/section_chats@2x.png
--- a/Telegram/Resources/export_html/images/section_contacts.png
+++ b/Telegram/Resources/export_html/images/section_contacts.png
--- a/Telegram/Resources/export_html/images/section_contacts@2x.png
+++ b/Telegram/Resources/export_html/images/section_contacts@2x.png
--- a/Telegram/Resources/export_html/images/section_frequent.png
+++ b/Telegram/Resources/export_html/images/section_frequent.png
--- a/Telegram/Resources/export_html/images/section_frequent@2x.png
+++ b/Telegram/Resources/export_html/images/section_frequent@2x.png
--- a/Telegram/Resources/export_html/images/section_leftchats.png
+++ b/Telegram/Resources/export_html/images/section_leftchats.png
--- a/Telegram/Resources/export_html/images/section_leftchats@2x.png
+++ b/Telegram/Resources/export_html/images/section_leftchats@2x.png
--- a/Telegram/Resources/export_html/images/section_other.png
+++ b/Telegram/Resources/export_html/images/section_other.png
--- a/Telegram/Resources/export_html/images/section_other@2x.png
+++ b/Telegram/Resources/export_html/images/section_other@2x.png
--- a/Telegram/Resources/export_html/images/section_photos.png
+++ b/Telegram/Resources/export_html/images/section_photos.png
--- a/Telegram/Resources/export_html/images/section_photos@2x.png
+++ b/Telegram/Resources/export_html/images/section_photos@2x.png
--- a/Telegram/Resources/export_html/images/section_sessions.png
+++ b/Telegram/Resources/export_html/images/section_sessions.png
--- a/Telegram/Resources/export_html/images/section_sessions@2x.png
+++ b/Telegram/Resources/export_html/images/section_sessions@2x.png
--- a/Telegram/Resources/export_html/images/section_web.png
+++ b/Telegram/Resources/export_html/images/section_web.png
--- a/Telegram/Resources/export_html/images/section_web@2x.png
+++ b/Telegram/Resources/export_html/images/section_web@2x.png
--- a/Telegram/Resources/export_html/js/script.js
+++ b/Telegram/Resources/export_html/js/script.js
@@ -0,0 +1,189 @@
+"use strict";
+
+window.AllowBackFromHistory = false;
+function CheckLocation() {
+    var start = "#go_to_message";
+    var hash = location.hash;
+    if (hash.substr(0, start.length) == start) {
+        var messageId = parseInt(hash.substr(start.length));
+        if (messageId) {
+            GoToMessage(messageId);
+        }
+    } else if (hash == "#allow_back") {
+        window.AllowBackFromHistory = true;
+    }
+}
+
+function ShowToast(text) {
+    var container = document.createElement("div");
+    container.className = "toast_container";
+    var inner = container.appendChild(document.createElement("div"));
+    inner.className = "toast_body";
+    inner.appendChild(document.createTextNode(text));
+    var appended = document.body.appendChild(container);
+    setTimeout(function () {
+        AddClass(appended, "toast_shown");
+        setTimeout(function () {
+            RemoveClass(appended, "toast_shown");
+            setTimeout(function () {
+                document.body.removeChild(appended);
+            }, 3000);
+        }, 3000);
+    }, 0);
+}
+
+function ShowHashtag(tag) {
+    ShowToast("This is a hashtag '#" + tag + "' link.");
+    return false;
+}
+
+function ShowCashtag(tag) {
+    ShowToast("This is a cashtag '$" + tag + "' link.");
+    return false;
+}
+
+function ShowBotCommand(command) {
+    ShowToast("This is a bot command '/" + command + "' link.");
+    return false;
+}
+
+function ShowMentionName() {
+    ShowToast("This is a link to a user mentioned by name.");
+    return false;
+}
+
+function AddClass(element, name) {
+    var current = element.className;
+    var expression = new RegExp('(^|\\s)' + name + '(\\s|$)', 'g');
+    if (expression.test(current)) {
+        return;
+    }
+    element.className = current + ' ' + name;
+}
+
+function RemoveClass(element, name) {
+    var current = element.className;
+    var expression = new RegExp('(^|\\s)' + name + '(\\s|$)', '');
+    var match = expression.exec(current);
+    while ((match = expression.exec(current)) != null) {
+        if (match[1].length > 0 && match[2].length > 0) {
+            current = current.substr(0, match.index + match[1].length)
+                + current.substr(match.index + match[0].length);
+        } else {
+            current = current.substr(0, match.index)
+                + current.substr(match.index + match[0].length);
+        }
+    }
+    element.className = current;
+}
+
+function EaseOutQuad(t) {
+    return t * t;
+}
+
+function EaseInOutQuad(t) {
+    return (t < 0.5) ? (2 * t * t) : ((4 - 2 * t) * t - 1);
+}
+
+function ScrollHeight() {
+    if ("innerHeight" in window) {
+        return window.innerHeight;
+    } else if (document.documentElement) {
+        return document.documentElement.clientHeight;
+    }
+    return document.body.clientHeight;
+}
+
+function ScrollTo(top, callback) {
+    var html = document.documentElement;
+    var current = html.scrollTop;
+    var delta = top - current;
+    var finish = function () {
+        html.scrollTop = top;
+        if (callback) {
+            callback();
+        }
+    };
+    if (!window.performance.now || delta == 0) {
+        finish();
+        return;
+    }
+    var transition = EaseOutQuad;
+    var max = 300;
+    if (delta < -max) {
+        current = top + max;
+        delta = -max;
+    } else if (delta > max) {
+        current = top - max;
+        delta = max;
+    } else {
+        transition = EaseInOutQuad;
+    }
+    var duration = 150;
+    var interval = 7;
+    var time = window.performance.now();
+    var animate = function () {
+        var now = window.performance.now();
+        if (now >= time + duration) {
+            finish();
+            return;
+        }
+        var dt = (now - time) / duration;
+        html.scrollTop = Math.round(current + delta * transition(dt));
+        setTimeout(animate, interval);
+    };
+    setTimeout(animate, interval);
+}
+
+function ScrollToElement(element, callback) {
+    var header = document.getElementsByClassName("page_header")[0];
+    var headerHeight = header.offsetHeight;
+    var html = document.documentElement;
+    var scrollHeight = ScrollHeight();
+    var available = scrollHeight - headerHeight;
+    var padding = 10;
+    var top = element.offsetTop;
+    var height = element.offsetHeight;
+    var desired = top
+        - Math.max((available - height) / 2, padding)
+        - headerHeight;
+    var scrollTopMax = html.offsetHeight - scrollHeight;
+    ScrollTo(Math.min(desired, scrollTopMax), callback);
+}
+
+function GoToMessage(messageId) {
+    var element = document.getElementById("message" + messageId);
+    if (element) {
+        var hash = "#go_to_message" + messageId;
+        if (location.hash != hash) {
+            location.hash = hash;
+        }
+        ScrollToElement(element, function () {
+            AddClass(element, "selected");
+            setTimeout(function () {
+                RemoveClass(element, "selected");
+            }, 1000);
+        });
+    } else {
+        ShowToast("This message was not exported. Maybe it was deleted.");
+    }
+    return false;
+}
+
+function GoBack(anchor) {
+    if (!window.AllowBackFromHistory) {
+        return true;
+    }
+    history.back();
+    if (!anchor || !anchor.getAttribute) {
+        return true;
+    }
+    var destination = anchor.getAttribute("href");
+    if (!destination) {
+        return true;
+    }
+    setTimeout(function () {
+        location.href = destination;
+    }, 100);
+    return false;
+}
--- a/Telegram/Resources/fc-custom.conf
+++ b/Telegram/Resources/fc-custom.conf
@@ -0,0 +1,57 @@
+<?xml version='1.0'?>
+<!DOCTYPE fontconfig SYSTEM 'fonts.dtd'>
+<fontconfig>
+	<dir>/usr/share/fonts</dir>
+	<dir>/usr/local/share/fonts</dir>
+	<dir>~/.fonts</dir>
+	<dir>~/.local/share/fonts</dir>
+	<dir>/usr/X11R6/lib/X11/fonts</dir>
+	<dir prefix="xdg">fonts</dir>
+	<match target="pattern">
+		<test qual="any" name="family">
+			<string>mono</string>
+		</test>
+		<edit name="family" mode="assign" binding="same">
+			<string>monospace</string>
+		</edit>
+	</match>
+	<match target="pattern">
+		<test qual="any" name="family">
+			<string>sans serif</string>
+		</test>
+		<edit name="family" mode="assign" binding="same">
+			<string>sans-serif</string>
+		</edit>
+	</match>
+	<match target="pattern">
+		<test qual="any" name="family">
+			<string>sans</string>
+		</test>
+		<edit name="family" mode="assign" binding="same">
+			<string>sans-serif</string>
+		</edit>
+	</match>
+	<cachedir>/var/cache/fontconfig_11</cachedir>
+	<cachedir prefix="xdg">fontconfig_11</cachedir>
+	<cachedir>~/.fontconfig_11</cachedir>
+	<match target="font">
+	<edit mode="assign" name="antialias">
+		<bool>true</bool>
+	</edit>
+	<edit mode="assign" name="embeddedbitmap">
+		<bool>false</bool>
+	</edit>
+	<edit mode="assign" name="hinting">
+		<bool>true</bool>
+	</edit>
+	<edit mode="assign" name="hintstyle">
+		<const>hintslight</const>
+	</edit>
+	<edit mode="assign" name="lcdfilter">
+		<const>lcddefault</const>
+	</edit>
+	<edit mode="assign" name="rgba">
+		<const>rgb</const>
+	</edit>
+	</match>
+</fontconfig>
--- a/Telegram/Resources/icons/add_contact_phone.png
+++ b/Telegram/Resources/icons/add_contact_phone.png
--- a/Telegram/Resources/icons/add_contact_phone@2x.png
+++ b/Telegram/Resources/icons/add_contact_phone@2x.png
--- a/Telegram/Resources/icons/add_contact_user.png
+++ b/Telegram/Resources/icons/add_contact_user.png
--- a/Telegram/Resources/icons/add_contact_user@2x.png
+++ b/Telegram/Resources/icons/add_contact_user@2x.png
--- a/Telegram/Resources/icons/archive_userpic.png
+++ b/Telegram/Resources/icons/archive_userpic.png
--- a/Telegram/Resources/icons/archive_userpic@2x.png
+++ b/Telegram/Resources/icons/archive_userpic@2x.png
--- a/Telegram/Resources/icons/archive_userpic@3x.png
+++ b/Telegram/Resources/icons/archive_userpic@3x.png
--- a/Telegram/Resources/icons/box_button_back@3x.png
+++ b/Telegram/Resources/icons/box_button_back@3x.png
--- a/Telegram/Resources/icons/box_button_close@3x.png
+++ b/Telegram/Resources/icons/box_button_close@3x.png
--- a/Telegram/Resources/icons/box_search@3x.png
+++ b/Telegram/Resources/icons/box_search@3x.png
--- a/Telegram/Resources/icons/bubble_tail@3x.png
+++ b/Telegram/Resources/icons/bubble_tail@3x.png
--- a/Telegram/Resources/icons/call_answer@3x.png
+++ b/Telegram/Resources/icons/call_answer@3x.png
--- a/Telegram/Resources/icons/call_arrow_in@3x.png
+++ b/Telegram/Resources/icons/call_arrow_in@3x.png
--- a/Telegram/Resources/icons/call_arrow_out@3x.png
+++ b/Telegram/Resources/icons/call_arrow_out@3x.png
--- a/Telegram/Resources/icons/call_discard@3x.png
+++ b/Telegram/Resources/icons/call_discard@3x.png
--- a/Telegram/Resources/icons/call_rating@3x.png
+++ b/Telegram/Resources/icons/call_rating@3x.png
--- a/Telegram/Resources/icons/call_rating_filled@3x.png
+++ b/Telegram/Resources/icons/call_rating_filled@3x.png
--- a/Telegram/Resources/icons/call_record_active@3x.png
+++ b/Telegram/Resources/icons/call_record_active@3x.png
--- a/Telegram/Resources/icons/call_record_muted@3x.png
+++ b/Telegram/Resources/icons/call_record_muted@3x.png
--- a/Telegram/Resources/icons/call_shadow_left@3x.png
+++ b/Telegram/Resources/icons/call_shadow_left@3x.png
--- a/Telegram/Resources/icons/call_shadow_top@3x.png
+++ b/Telegram/Resources/icons/call_shadow_top@3x.png
--- a/Telegram/Resources/icons/call_shadow_top_left@3x.png
+++ b/Telegram/Resources/icons/call_shadow_top_left@3x.png
--- a/Telegram/Resources/icons/color_slider_arrow@3x.png
+++ b/Telegram/Resources/icons/color_slider_arrow@3x.png
--- a/Telegram/Resources/icons/color_slider_arrow_vertical@3x.png
+++ b/Telegram/Resources/icons/color_slider_arrow_vertical@3x.png
--- a/Show More
+++ b/Show More