diff --git a/src/messages/MessageBuilder.cpp b/src/messages/MessageBuilder.cpp
index 49c96c94..ec4917b6 100644
--- a/src/messages/MessageBuilder.cpp
+++ b/src/messages/MessageBuilder.cpp
@@ -82,6 +82,10 @@ MessageBuilder::MessageBuilder(TimeoutMessageTag, const QString &username,
     this->message().flags.set(MessageFlag::Timeout);
     this->message().flags.set(MessageFlag::DoNotTriggerNotification);
     this->message().timeoutUser = username;
+    this->emplace<TimestampElement>();
+    this->emplace<TextElement>(text, MessageElementFlag::Text,
+                               MessageColor::System);
+    this->message().searchText = text;
 }
 
 MessageBuilder::MessageBuilder(const BanAction &action, uint32_t count)