diff --git a/Telegram/PrepareWin.bat b/Telegram/PrepareWin.bat
index 24f339250..eba87711c 100644
--- a/Telegram/PrepareWin.bat
+++ b/Telegram/PrepareWin.bat
@@ -1,10 +1,10 @@
 @echo OFF
 
-set "AppVersion=8021"
-set "AppVersionStrSmall=0.8.21"
-set "AppVersionStr=0.8.21"
-set "AppVersionStrFull=0.8.21.0"
-set "DevChannel=0"
+set "AppVersion=8022"
+set "AppVersionStrSmall=0.8.22"
+set "AppVersionStr=0.8.22"
+set "AppVersionStrFull=0.8.22.0"
+set "DevChannel=1"
 
 if %DevChannel% neq 0 goto preparedev
 
diff --git a/Telegram/SourceFiles/config.h b/Telegram/SourceFiles/config.h
index b651c2690..22a9a54f5 100644
--- a/Telegram/SourceFiles/config.h
+++ b/Telegram/SourceFiles/config.h
@@ -17,9 +17,9 @@ Copyright (c) 2014 John Preston, https://desktop.telegram.org
 */
 #pragma once
 
-static const int32 AppVersion = 8021;
-static const wchar_t *AppVersionStr = L"0.8.21";
-static const bool DevChannel = false;
+static const int32 AppVersion = 8022;
+static const wchar_t *AppVersionStr = L"0.8.22";
+static const bool DevChannel = true;
 
 static const wchar_t *AppNameOld = L"Telegram Win (Unofficial)";
 static const wchar_t *AppName = L"Telegram Desktop";
diff --git a/Telegram/SourceFiles/historywidget.cpp b/Telegram/SourceFiles/historywidget.cpp
index 55ac7471d..0acddab2f 100644
--- a/Telegram/SourceFiles/historywidget.cpp
+++ b/Telegram/SourceFiles/historywidget.cpp
@@ -4402,7 +4402,7 @@ void HistoryWidget::paintEvent(QPaintEvent *e) {
 			if (!_field.isHidden() || _recording) {
 				drawFieldBackground(p);
 			}
-			if (_send.isHidden()) {
+			if (!_field.isHidden() && _send.isHidden()) {
 				if (a_recordDown.current() < 1) {
 					p.setOpacity(st::btnAttachEmoji.opacity * (1 - a_recordOver.current()) + st::btnAttachEmoji.overOpacity * a_recordOver.current());
 					p.drawSprite(_send.x() + (_send.width() - st::btnRecordAudio.pxWidth()) / 2, _send.y() + (_send.height() - st::btnRecordAudio.pxHeight()) / 2, st::btnRecordAudio);
diff --git a/Telegram/Telegram.plist b/Telegram/Telegram.plist
index 9c7aabc3a..1c11dcb56 100644
--- a/Telegram/Telegram.plist
+++ b/Telegram/Telegram.plist
@@ -11,7 +11,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.8.21</string>
+	<string>0.8.22</string>
         <key>LSMinimumSystemVersion</key>
         <string>$(MACOSX_DEPLOYMENT_TARGET)</string>
 	<key>CFBundleSignature</key>
diff --git a/Telegram/Telegram.pro b/Telegram/Telegram.pro
index 4503305fb..8eabffcdc 100644
--- a/Telegram/Telegram.pro
+++ b/Telegram/Telegram.pro
@@ -83,6 +83,7 @@ SOURCES += \
     ./SourceFiles/app.cpp \
     ./SourceFiles/application.cpp \
     ./SourceFiles/audio.cpp \
+    ./SourceFiles/autoupdater.cpp \
     ./SourceFiles/dialogswidget.cpp \
     ./SourceFiles/dropdown.cpp \
     ./SourceFiles/fileuploader.cpp \
@@ -166,6 +167,7 @@ HEADERS += \
     ./SourceFiles/app.h \
     ./SourceFiles/application.h \
     ./SourceFiles/audio.h \
+    ./SourceFiles/autoupdater.h \
     ./SourceFiles/config.h \
     ./SourceFiles/countries.h \
     ./SourceFiles/dialogswidget.h \
diff --git a/Telegram/Telegram.rc b/Telegram/Telegram.rc
index c94a30ea4..a8b0b5c3a 100644
Binary files a/Telegram/Telegram.rc and b/Telegram/Telegram.rc differ
diff --git a/Telegram/Telegram.xcodeproj/project.pbxproj b/Telegram/Telegram.xcodeproj/project.pbxproj
index 8b1ba6187..aae6749d6 100644
--- a/Telegram/Telegram.xcodeproj/project.pbxproj
+++ b/Telegram/Telegram.xcodeproj/project.pbxproj
@@ -1693,7 +1693,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 0.8.21;
+				CURRENT_PROJECT_VERSION = 0.8.22;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
 				GCC_OPTIMIZATION_LEVEL = 0;
@@ -1711,7 +1711,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				COPY_PHASE_STRIP = YES;
-				CURRENT_PROJECT_VERSION = 0.8.21;
+				CURRENT_PROJECT_VERSION = 0.8.22;
 				GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
 				GCC_OPTIMIZATION_LEVEL = fast;
 				GCC_PREFIX_HEADER = ./SourceFiles/stdafx.h;
@@ -1737,10 +1737,10 @@
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				CODE_SIGN_IDENTITY = "";
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 0.8.21;
+				CURRENT_PROJECT_VERSION = 0.8.22;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DYLIB_COMPATIBILITY_VERSION = 0.8;
-				DYLIB_CURRENT_VERSION = 0.8.21;
+				DYLIB_CURRENT_VERSION = 0.8.22;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				FRAMEWORK_SEARCH_PATHS = "";
 				GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
@@ -1880,10 +1880,10 @@
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				CODE_SIGN_IDENTITY = "";
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 0.8.21;
+				CURRENT_PROJECT_VERSION = 0.8.22;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				DYLIB_COMPATIBILITY_VERSION = 0.8;
-				DYLIB_CURRENT_VERSION = 0.8.21;
+				DYLIB_CURRENT_VERSION = 0.8.22;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				FRAMEWORK_SEARCH_PATHS = "";
 				GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
diff --git a/Telegram/Version.sh b/Telegram/Version.sh
index 20044b630..885e69b13 100755
--- a/Telegram/Version.sh
+++ b/Telegram/Version.sh
@@ -1,2 +1,2 @@
-echo 8021 0.8.21 0
+echo 8022 0.8.22 1
 # AppVersion AppVersionStr DevChannel