diff --git a/Telegram/PrepareWin.bat b/Telegram/PrepareWin.bat
index f18a600f7..fa71d7bac 100644
--- a/Telegram/PrepareWin.bat
+++ b/Telegram/PrepareWin.bat
@@ -1,9 +1,9 @@
 @echo OFF
 
-set "AppVersion=8003"
-set "AppVersionStrSmall=0.8.3"
-set "AppVersionStr=0.8.3"
-set "AppVersionStrFull=0.8.3.0"
+set "AppVersion=8004"
+set "AppVersionStrSmall=0.8.4"
+set "AppVersionStr=0.8.4"
+set "AppVersionStrFull=0.8.4.0"
 set "DevChannel=0"
 
 if %DevChannel% neq 0 goto preparedev
diff --git a/Telegram/SourceFiles/config.h b/Telegram/SourceFiles/config.h
index 87ca86a0b..6e26233ea 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 = 8003;
-static const wchar_t *AppVersionStr = L"0.8.3";
+static const int32 AppVersion = 8004;
+static const wchar_t *AppVersionStr = L"0.8.4";
 static const bool DevChannel = false;
 
 static const wchar_t *AppNameOld = L"Telegram Win (Unofficial)";
diff --git a/Telegram/SourceFiles/mainwidget.cpp b/Telegram/SourceFiles/mainwidget.cpp
index f36cec797..8fefcad99 100644
--- a/Telegram/SourceFiles/mainwidget.cpp
+++ b/Telegram/SourceFiles/mainwidget.cpp
@@ -1138,6 +1138,11 @@ void MainWidget::itemReplaced(HistoryItem *oldItem, HistoryItem *newItem) {
 void MainWidget::itemResized(HistoryItem *row, bool scrollToIt) {
 	if (!row || (history.peer() == row->history()->peer && !row->detached())) {
 		history.itemResized(row, scrollToIt);
+	} else if (row) {
+		row->history()->width = 0;
+		if (history.peer() == row->history()->peer) {
+			history.resizeEvent(0);
+		}
 	}
 	if (overview) {
 		overview->itemResized(row, scrollToIt);
diff --git a/Telegram/Telegram.plist b/Telegram/Telegram.plist
index 1fd75ca6e..9075382d7 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.3</string>
+	<string>0.8.4</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
diff --git a/Telegram/Telegram.rc b/Telegram/Telegram.rc
index 60f8116ec..f20174328 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 81fe037b3..5ab3a140f 100644
--- a/Telegram/Telegram.xcodeproj/project.pbxproj
+++ b/Telegram/Telegram.xcodeproj/project.pbxproj
@@ -1683,7 +1683,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 0.8.3;
+				CURRENT_PROJECT_VERSION = 0.8.4;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
 				GCC_OPTIMIZATION_LEVEL = 0;
@@ -1701,7 +1701,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				COPY_PHASE_STRIP = YES;
-				CURRENT_PROJECT_VERSION = 0.8.3;
+				CURRENT_PROJECT_VERSION = 0.8.4;
 				GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
 				GCC_OPTIMIZATION_LEVEL = fast;
 				GCC_PREFIX_HEADER = ./SourceFiles/stdafx.h;
@@ -1727,10 +1727,10 @@
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				CODE_SIGN_IDENTITY = "";
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 0.8.3;
+				CURRENT_PROJECT_VERSION = 0.8.4;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DYLIB_COMPATIBILITY_VERSION = 0.8;
-				DYLIB_CURRENT_VERSION = 0.8.3;
+				DYLIB_CURRENT_VERSION = 0.8.4;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				FRAMEWORK_SEARCH_PATHS = "";
 				GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
@@ -1868,10 +1868,10 @@
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				CODE_SIGN_IDENTITY = "";
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 0.8.3;
+				CURRENT_PROJECT_VERSION = 0.8.4;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				DYLIB_COMPATIBILITY_VERSION = 0.8;
-				DYLIB_CURRENT_VERSION = 0.8.3;
+				DYLIB_CURRENT_VERSION = 0.8.4;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				FRAMEWORK_SEARCH_PATHS = "";
 				GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
diff --git a/Telegram/Version.sh b/Telegram/Version.sh
index be15b1ceb..430fda87f 100755
--- a/Telegram/Version.sh
+++ b/Telegram/Version.sh
@@ -1,2 +1,2 @@
-echo 8003 0.8.3 0
+echo 8004 0.8.4 0
 # AppVersion AppVersionStr DevChannel