diff --git a/src/HistoryView.cc b/src/HistoryView.cc
index c54e139f..3692c493 100644
--- a/src/HistoryView.cc
+++ b/src/HistoryView.cc
@@ -116,6 +116,7 @@ void HistoryView::init()
 
 	scroll_area_ = new QScrollArea(this);
 	scroll_area_->setWidgetResizable(true);
+	scroll_area_->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
 
 	scroll_widget_ = new QWidget();
 
diff --git a/src/HistoryViewItem.cc b/src/HistoryViewItem.cc
index 99154ea1..c23091fe 100644
--- a/src/HistoryViewItem.cc
+++ b/src/HistoryViewItem.cc
@@ -28,8 +28,7 @@ HistoryViewItem::HistoryViewItem(const Event &event, bool with_sender, const QSt
 	if (with_sender)
 		sender = event.sender().split(":")[0].split("@")[1];
 
-	auto body = event.content().value("body").toString().simplified();
-
+	auto body = event.content().value("body").toString().trimmed();
 	auto timestamp = QDateTime::fromMSecsSinceEpoch(event.timestamp());
 	auto local_time = timestamp.toString("HH:mm");