1 files changed, 2 insertions, 2 deletions
diff --git a/Swift/QtUI/QtHistoryWindow.cpp b/Swift/QtUI/QtHistoryWindow.cpp
index 77a7f12..0e7e89d 100644
--- a/Swift/QtUI/QtHistoryWindow.cpp
+++ b/Swift/QtUI/QtHistoryWindow.cpp
@@ -43,19 +43,19 @@ namespace Swift {
 QtHistoryWindow::QtHistoryWindow(SettingsProvider* settings, UIEventStream* eventStream) :
         previousTopMessageWasSelf_(false),
         previousBottomMessageWasSelf_(false) {
     ui_.setupUi(this);
 
     theme_ = new QtChatTheme("");
     idCounter_ = 0;
 
     delete ui_.conversation_;
-    conversation_ = new QtWebKitChatView(nullptr, nullptr, theme_, this, true); // Horrible unsafe. Do not do this. FIXME
+    conversation_ = new QtWebKitChatView(nullptr, nullptr, theme_, this, settings, true); // Horrible unsafe. Do not do this. FIXME
     QSizePolicy sizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred);
     sizePolicy.setHorizontalStretch(80);
     sizePolicy.setVerticalStretch(0);
     conversation_->setSizePolicy(sizePolicy);
 
     ui_.conversation_ = conversation_;
     ui_.bottomLayout_->addWidget(conversation_);
 
     delete ui_.conversationRoster_;
@@ -125,19 +125,19 @@ void QtHistoryWindow::addMessage(const std::string &message, const std::string &
     if (searchTerm.length()) {
         messageHTML.replace(searchTerm, "<span style='background-color: yellow'>" + searchTerm + "</span>");
     }
 
     // note: time uses localtime
     QDate date = QDate(time.date().year(), time.date().month(), time.date().day());
     QTime dayTime = QTime(time.time_of_day().hours(), time.time_of_day().minutes(), time.time_of_day().seconds());
     QDateTime qTime = QDateTime(date, dayTime);
 
-    std::string id = "id" + boost::lexical_cast<std::string>(idCounter_++);
+    std::string id = "id" + std::to_string(idCounter_++);
 
     QString qAvatarPath =  scaledAvatarPath.isEmpty() ? "qrc:/icons/avatar.png" : QUrl::fromLocalFile(scaledAvatarPath).toEncoded();
 
     if (addAtTheTop) {
         bool appendToPrevious = ((senderIsSelf && previousTopMessageWasSelf_) || (!senderIsSelf && !previousTopMessageWasSelf_&& previousTopSenderName_ == P2QSTRING(senderName)));
         conversation_->addMessageTop(std::make_shared<MessageSnippet>(messageHTML, QtUtilities::htmlEscape(P2QSTRING(senderName)), qTime, qAvatarPath, senderIsSelf, appendToPrevious, theme_, P2QSTRING(id), ChatSnippet::getDirection(message)));
 
         previousTopMessageWasSelf_ = senderIsSelf;
         previousTopSenderName_ = P2QSTRING(senderName);