diff --git a/Telegram/SourceFiles/settings/settings_chat.cpp b/Telegram/SourceFiles/settings/settings_chat.cpp
index f13d1d52e..a02b6ad20 100644
--- a/Telegram/SourceFiles/settings/settings_chat.cpp
+++ b/Telegram/SourceFiles/settings/settings_chat.cpp
@@ -834,8 +834,7 @@ void SetupStickersEmoji(
 
 void SetupMessages(
 		not_null<Window::SessionController*> controller,
-		not_null<Ui::VerticalLayout*> container,
-		Fn<void(Type)> showOther) {
+		not_null<Ui::VerticalLayout*> container) {
 	Ui::AddDivider(container);
 	Ui::AddSkip(container);
 
@@ -1005,8 +1004,17 @@ void SetupMessages(
 		Core::App().saveSettingsDelayed();
 	}, inner->lifetime());
 
+	Ui::AddSkip(inner);
+}
+
+void SetupArchive(
+		not_null<Window::SessionController*> controller,
+		not_null<Ui::VerticalLayout*> container,
+		Fn<void(Type)> showOther) {
+	Ui::AddSkip(container);
+
 	AddButtonWithIcon(
-		inner,
+		container,
 		tr::lng_settings_shortcuts(),
 		st::settingsButton,
 		{ &st::menuIconShortcut }
@@ -1014,14 +1022,6 @@ void SetupMessages(
 		showOther(Shortcuts::Id());
 	});
 
-	Ui::AddSkip(inner);
-}
-
-void SetupArchive(
-		not_null<Window::SessionController*> controller,
-		not_null<Ui::VerticalLayout*> container) {
-	Ui::AddSkip(container);
-
 	PreloadArchiveSettings(&controller->session());
 	AddButtonWithIcon(
 		container,
@@ -1804,10 +1804,10 @@ void Chat::setupContent(not_null<Window::SessionController*> controller) {
 	SetupCloudThemes(controller, content);
 	SetupChatBackground(controller, content);
 	SetupStickersEmoji(controller, content);
-	SetupMessages(controller, content, showOtherMethod());
+	SetupMessages(controller, content);
 	Ui::AddDivider(content);
 	SetupSensitiveContent(controller, content, std::move(updateOnTick));
-	SetupArchive(controller, content);
+	SetupArchive(controller, content, showOtherMethod());
 
 	Ui::ResizeFitChild(this, content);
 }