diff --git a/Telegram/PrepareWin.bat b/Telegram/PrepareWin.bat
index 5a6375333..96c131b62 100644
--- a/Telegram/PrepareWin.bat
+++ b/Telegram/PrepareWin.bat
@@ -1,8 +1,8 @@
 @echo OFF
 
-set "AppVersionStrSmall=0.6.18"
-set "AppVersionStr=0.6.18"
-set "AppVersionStrFull=0.6.18.0"
+set "AppVersionStrSmall=0.6.19"
+set "AppVersionStr=0.6.19"
+set "AppVersionStrFull=0.6.19.0"
 
 echo.
 echo Preparing version %AppVersionStr%..
diff --git a/Telegram/SourceFiles/application.cpp b/Telegram/SourceFiles/application.cpp
index d13f0e06e..2741f8e41 100644
--- a/Telegram/SourceFiles/application.cpp
+++ b/Telegram/SourceFiles/application.cpp
@@ -679,7 +679,7 @@ void Application::startApp() {
 	QNetworkProxyFactory::setUseSystemConfiguration(true);
 	if (Local::oldMapVersion() < AppVersion) {
 		psRegisterCustomScheme();
-		if (Local::oldMapVersion() && AppVersion == FeaturesNotifyVersion) {
+		if (Local::oldMapVersion() && Local::oldMapVersion() <= FeaturesNotifyVersionFrom && AppVersion == FeaturesNotifyVersion) {
 			QString versionFeatures(QString::fromUtf8(FeaturesNotify));
 			if (!versionFeatures.isEmpty()) {
 				window->serviceNotification(versionFeatures);
diff --git a/Telegram/SourceFiles/config.h b/Telegram/SourceFiles/config.h
index 4d47f1bf6..081ae5990 100644
--- a/Telegram/SourceFiles/config.h
+++ b/Telegram/SourceFiles/config.h
@@ -17,8 +17,8 @@ Copyright (c) 2014 John Preston, https://desktop.telegram.org
 */
 #pragma once
 
-static const int32 AppVersion = 6018;
-static const wchar_t *AppVersionStr = L"0.6.18";
+static const int32 AppVersion = 6019;
+static const wchar_t *AppVersionStr = L"0.6.19";
 
 static const wchar_t *AppNameOld = L"Telegram Win (Unofficial)";
 static const wchar_t *AppName = L"Telegram Desktop";
@@ -26,7 +26,8 @@ static const wchar_t *AppName = L"Telegram Desktop";
 static const wchar_t *AppId = L"{53F49750-6209-4FBF-9CA8-7A333C87D1ED}"; // used in updater.cpp and Setup.iss for Windows
 static const wchar_t *AppFile = L"Telegram";
 
-static const int32 FeaturesNotifyVersion = 6018;
+static const int32 FeaturesNotifyVersion = 6019;
+static const int32 FeaturesNotifyVersionFrom = 6017;
 extern const char *FeaturesNotify;
 
 #include "settings.h"
diff --git a/Telegram/SourceFiles/historywidget.cpp b/Telegram/SourceFiles/historywidget.cpp
index 98600bb27..e9949fe93 100644
--- a/Telegram/SourceFiles/historywidget.cpp
+++ b/Telegram/SourceFiles/historywidget.cpp
@@ -2243,8 +2243,6 @@ void HistoryWidget::loadMessagesAround() {
 }
 
 void HistoryWidget::onListScroll() {
-	if (_scroll.isHidden()) return;
-
 	App::checkImageCacheSize();
 
 	if (histPreloading || !hist || ((_list->isHidden() || _scroll.isHidden() || !App::wnd()->windowHandle()->isVisible()) && hist->readyForWork())) {
diff --git a/Telegram/SourceFiles/localstorage.cpp b/Telegram/SourceFiles/localstorage.cpp
index d09070c9e..ec288cc06 100644
--- a/Telegram/SourceFiles/localstorage.cpp
+++ b/Telegram/SourceFiles/localstorage.cpp
@@ -637,6 +637,9 @@ namespace {
 		_locationsKey = locationsKey;
 		_mapChanged = false;
 		_oldMapVersion = mapData.version;
+		if (_oldMapVersion < AppVersion) {
+			_writeMap();
+		}
 
 		if (_locationsKey) {
 			_readLocations();
diff --git a/Telegram/Telegram.plist b/Telegram/Telegram.plist
index 4b2119d65..e010ceac5 100644
--- a/Telegram/Telegram.plist
+++ b/Telegram/Telegram.plist
@@ -11,7 +11,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.6.18</string>
+	<string>0.6.19</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
diff --git a/Telegram/Telegram.xcodeproj/project.pbxproj b/Telegram/Telegram.xcodeproj/project.pbxproj
index 579b5d5b0..b9d862bf8 100644
--- a/Telegram/Telegram.xcodeproj/project.pbxproj
+++ b/Telegram/Telegram.xcodeproj/project.pbxproj
@@ -1577,7 +1577,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 0.6.18;
+				CURRENT_PROJECT_VERSION = 0.6.19;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
 				GCC_OPTIMIZATION_LEVEL = 0;
@@ -1595,7 +1595,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				COPY_PHASE_STRIP = YES;
-				CURRENT_PROJECT_VERSION = 0.6.18;
+				CURRENT_PROJECT_VERSION = 0.6.19;
 				GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
 				GCC_OPTIMIZATION_LEVEL = fast;
 				GCC_PREFIX_HEADER = ./SourceFiles/stdafx.h;
@@ -1621,10 +1621,10 @@
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				CODE_SIGN_IDENTITY = "";
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 0.6.18;
+				CURRENT_PROJECT_VERSION = 0.6.19;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				DYLIB_COMPATIBILITY_VERSION = 0.6;
-				DYLIB_CURRENT_VERSION = 0.6.18;
+				DYLIB_CURRENT_VERSION = 0.6.19;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				FRAMEWORK_SEARCH_PATHS = "";
 				GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
@@ -1764,10 +1764,10 @@
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				CODE_SIGN_IDENTITY = "";
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 0.6.18;
+				CURRENT_PROJECT_VERSION = 0.6.19;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				DYLIB_COMPATIBILITY_VERSION = 0.6;
-				DYLIB_CURRENT_VERSION = 0.6.18;
+				DYLIB_CURRENT_VERSION = 0.6.19;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				FRAMEWORK_SEARCH_PATHS = "";
 				GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
diff --git a/Telegram/Version.sh b/Telegram/Version.sh
index a373be447..b4d354701 100755
--- a/Telegram/Version.sh
+++ b/Telegram/Version.sh
@@ -1,2 +1,2 @@
-echo 6018 0.6.18
+echo 6019 0.6.19