Merge 00f2fe7fe6 into 2f967978f2

src/timeline/InputBar.cpp

@@ -20,8 +20,6 @@
 #include <QVideoFrame>
 #include <QVideoSink>
 
-#include <fmt/format.h>
-
 #include <nlohmann/json.hpp>
 
 #include <mtx/responses/common.hpp>
@@ -580,7 +578,8 @@ InputBar::message(const QString &msg, MarkdownOverride useMarkdown, bool rainbow
                 }
             }
 
-            text.body = fmt::format("{}\n{}", body.toStdString(), text.body);
+            text.body =
+              QStringLiteral("%1\n%2").arg(body, QString::fromStdString(text.body)).toStdString();
 
             // NOTE(Nico): rich replies always need a formatted_body!
             text.format = "org.matrix.custom.html";