diff --git a/src/timeline/models/timelinemessagemodel.cpp b/src/timeline/models/timelinemessagemodel.cpp index e02fa0c97..9b791a815 100644 --- a/src/timeline/models/timelinemessagemodel.cpp +++ b/src/timeline/models/timelinemessagemodel.cpp @@ -5,6 +5,8 @@ #include "events/pollevent.h" #include "messagemodel_logging.h" +#include + using namespace Quotient; TimelineMessageModel::TimelineMessageModel(QObject *parent) @@ -62,7 +64,10 @@ void TimelineMessageModel::connectNewRoom() }); connect(m_room, &Room::pendingEventAdded, this, [this](const Quotient::RoomEvent *event) { Q_EMIT newEventAdded(event); - Q_EMIT newLocalUserEventAdded(); + // Don't scroll the timeline view for reactions. + if (!event->is()) { + Q_EMIT newLocalUserEventAdded(); + } if (!m_resetting) { beginInsertRows({}, 0, 0); endInsertRows();