diff --git a/src/main_screen.cpp b/src/main_screen.cpp
index 495d40e8..5d4cfa43 100644
--- a/src/main_screen.cpp
+++ b/src/main_screen.cpp
@@ -9,6 +9,7 @@
 MainScreen::MainScreen(SDL_Renderer* renderer_, std::string save_path) :
 	renderer(renderer_),
 	rmm(cr),
+	mts(rmm),
 	tc(save_path),
 	ad(tc),
 	tcm(cr, tc, tc),
@@ -63,6 +64,8 @@ Screen* MainScreen::poll(bool& quit) {
 
 	pm.tick(time_delta);
 
+	mts.iterate();
+
 	cg.render();
 
 	{
diff --git a/src/main_screen.hpp b/src/main_screen.hpp
index 47edc87c..c8c71f5b 100644
--- a/src/main_screen.hpp
+++ b/src/main_screen.hpp
@@ -5,6 +5,7 @@
 #include <solanaceae/util/simple_config_model.hpp>
 #include <solanaceae/contact/contact_model3.hpp>
 #include <solanaceae/message3/registry_message_model.hpp>
+#include <solanaceae/message3/message_time_sort.hpp>
 #include <solanaceae/plugin/plugin_manager.hpp>
 #include <solanaceae/toxcore/tox_event_logger.hpp>
 
@@ -35,6 +36,7 @@ struct MainScreen final : public Screen {
 	SimpleConfigModel conf;
 	Contact3Registry cr;
 	RegistryMessageModel rmm;
+	MessageTimeSort mts;
 
 	PluginManager pm;