diff --git a/Telegram/SourceFiles/app.h b/Telegram/SourceFiles/app.h
index 6d15438896..fc7c3c6a87 100644
--- a/Telegram/SourceFiles/app.h
+++ b/Telegram/SourceFiles/app.h
@@ -85,7 +85,6 @@ namespace App {
 	void setLaunchState(LaunchState state);
 	void restart();
 
-	constexpr auto kFileSizeLimit = 1500 * 1024 * 1024; // Load files up to 1500mb
 	constexpr auto kImageSizeLimit = 64 * 1024 * 1024; // Open images up to 64mb jpg/png/gif
 	QImage readImage(QByteArray data, QByteArray *format = nullptr, bool opaque = true, bool *animated = nullptr);
 	QImage readImage(const QString &file, QByteArray *format = nullptr, bool opaque = true, bool *animated = nullptr, QByteArray *content = 0);
diff --git a/Telegram/SourceFiles/data/data_auto_download.h b/Telegram/SourceFiles/data/data_auto_download.h
index ab2a6fe4e1..37c21a6201 100644
--- a/Telegram/SourceFiles/data/data_auto_download.h
+++ b/Telegram/SourceFiles/data/data_auto_download.h
@@ -12,7 +12,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 namespace Data {
 namespace AutoDownload {
 
-constexpr auto kMaxBytesLimit = 3000 * 512 * 1024;
+constexpr auto kMaxBytesLimit = 4000 * 512 * 1024;
 
 enum class Source {
 	User    = 0x00,
diff --git a/Telegram/SourceFiles/export/export_api_wrap.cpp b/Telegram/SourceFiles/export/export_api_wrap.cpp
index 1476b8ccca..c509f2a54b 100644
--- a/Telegram/SourceFiles/export/export_api_wrap.cpp
+++ b/Telegram/SourceFiles/export/export_api_wrap.cpp
@@ -27,7 +27,7 @@ constexpr auto kFileNextRequestDelay = crl::time(20);
 constexpr auto kChatsSliceLimit = 100;
 constexpr auto kMessagesSliceLimit = 100;
 constexpr auto kTopPeerSliceLimit = 100;
-constexpr auto kFileMaxSize = 1500 * 1024 * 1024;
+constexpr auto kFileMaxSize = 2000 * 1024 * 1024;
 constexpr auto kLocationCacheSize = 100'000;
 
 struct LocationKey {
diff --git a/Telegram/SourceFiles/export/export_settings.cpp b/Telegram/SourceFiles/export/export_settings.cpp
index 8c3ae84d0b..58d92ce4ae 100644
--- a/Telegram/SourceFiles/export/export_settings.cpp
+++ b/Telegram/SourceFiles/export/export_settings.cpp
@@ -12,7 +12,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 namespace Export {
 namespace {
 
-constexpr auto kMaxFileSize = 1500 * 1024 * 1024;
+constexpr auto kMaxFileSize = 2000 * 1024 * 1024;
 
 } // namespace
 
diff --git a/Telegram/SourceFiles/export/view/export_view_settings.cpp b/Telegram/SourceFiles/export/view/export_view_settings.cpp
index e9dbc40af1..c06e8e38c0 100644
--- a/Telegram/SourceFiles/export/view/export_view_settings.cpp
+++ b/Telegram/SourceFiles/export/view/export_view_settings.cpp
@@ -88,21 +88,18 @@ int SizeLimitByIndex(int index) {
 	const auto megabytes = [&] {
 		if (index <= 10) {
 			return index;
-		}
-		else if (index <= 30) {
+		} else if (index <= 30) {
 			return 10 + (index - 10) * 2;
-		}
-		else if (index <= 40) {
+		} else if (index <= 40) {
 			return 50 + (index - 30) * 5;
-		}
-		else if (index <= 60) {
+		} else if (index <= 60) {
 			return 100 + (index - 40) * 10;
-		}
-		else if (index <= 70) {
+		} else if (index <= 70) {
 			return 300 + (index - 60) * 20;
-		}
-		else {
-			return 500 + (index - 70) * 100;
+		} else if (index <= 80) {
+			return 500 + (index - 70) * 50;
+		} else {
+			return 1000 + (index - 80) * 100;
 		}
 	}();
 	return megabytes * kMegabyte;
diff --git a/Telegram/SourceFiles/export/view/export_view_settings.h b/Telegram/SourceFiles/export/view/export_view_settings.h
index 083828aebf..d8dc592247 100644
--- a/Telegram/SourceFiles/export/view/export_view_settings.h
+++ b/Telegram/SourceFiles/export/view/export_view_settings.h
@@ -25,7 +25,7 @@ class Session;
 namespace Export {
 namespace View {
 
-constexpr auto kSizeValueCount = 80;
+constexpr auto kSizeValueCount = 90;
 int SizeLimitByIndex(int index);
 
 class SettingsWidget : public Ui::RpWidget {
diff --git a/Telegram/SourceFiles/media/streaming/media_streaming_loader_local.cpp b/Telegram/SourceFiles/media/streaming/media_streaming_loader_local.cpp
index d3791830f0..a18ac399c2 100644
--- a/Telegram/SourceFiles/media/streaming/media_streaming_loader_local.cpp
+++ b/Telegram/SourceFiles/media/streaming/media_streaming_loader_local.cpp
@@ -16,7 +16,7 @@ namespace Streaming {
 namespace {
 
 // This is the maximum file size in Telegram API.
-constexpr auto kMaxFileSize = 3000 * 512 * 1024;
+constexpr auto kMaxFileSize = 4000 * 512 * 1024;
 
 int ValidateLocalSize(int64 size) {
 	return (size > 0 && size <= kMaxFileSize) ? int(size) : 0;
diff --git a/Telegram/SourceFiles/storage/localimageloader.cpp b/Telegram/SourceFiles/storage/localimageloader.cpp
index 26d9545730..7d7a9bcb6f 100644
--- a/Telegram/SourceFiles/storage/localimageloader.cpp
+++ b/Telegram/SourceFiles/storage/localimageloader.cpp
@@ -776,7 +776,7 @@ void FileLoadTask::process() {
 	}
 	_result->filesize = (int32)qMin(filesize, qint64(INT_MAX));
 
-	if (!filesize || filesize > App::kFileSizeLimit) {
+	if (!filesize || filesize > kFileSizeLimit) {
 		return;
 	}
 
@@ -962,7 +962,7 @@ void FileLoadTask::finish() {
 				tr::lng_send_image_empty(tr::now, lt_name, _filepath)),
 			Ui::LayerOption::KeepOther);
 		removeFromAlbum();
-	} else if (_result->filesize > App::kFileSizeLimit) {
+	} else if (_result->filesize > kFileSizeLimit) {
 		Ui::show(
 			Box<InformBox>(
 				tr::lng_send_image_too_large(tr::now, lt_name, _filepath)),
diff --git a/Telegram/SourceFiles/storage/localimageloader.h b/Telegram/SourceFiles/storage/localimageloader.h
index 009d032db2..200e46d0a1 100644
--- a/Telegram/SourceFiles/storage/localimageloader.h
+++ b/Telegram/SourceFiles/storage/localimageloader.h
@@ -10,6 +10,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "base/variant.h"
 #include "api/api_common.h"
 
+constexpr auto kFileSizeLimit = 2000 * 1024 * 1024; // Load files up to 1500mb
+
 enum class CompressConfirm {
 	Auto,
 	Yes,
diff --git a/Telegram/SourceFiles/storage/storage_media_prepare.cpp b/Telegram/SourceFiles/storage/storage_media_prepare.cpp
index 2a05a48374..42a6c83551 100644
--- a/Telegram/SourceFiles/storage/storage_media_prepare.cpp
+++ b/Telegram/SourceFiles/storage/storage_media_prepare.cpp
@@ -190,7 +190,7 @@ MimeDataState ComputeMimeDataState(const QMimeData *data) {
 		}
 
 		const auto filesize = info.size();
-		if (filesize > App::kFileSizeLimit) {
+		if (filesize > kFileSizeLimit) {
 			return MimeDataState::None;
 		} else if (allAreSmallImages) {
 			if (filesize > App::kImageSizeLimit) {
@@ -237,7 +237,7 @@ PreparedList PrepareMediaList(const QStringList &files, int previewWidth) {
 				PreparedList::Error::EmptyFile,
 				file
 			};
-		} else if (filesize > App::kFileSizeLimit) {
+		} else if (filesize > kFileSizeLimit) {
 			return {
 				PreparedList::Error::TooLargeFile,
 				file