diff --git a/src/widgets/room/messagelistdelegate.cpp b/src/widgets/room/messagelistdelegate.cpp
index 66fb03fe..3c263a1d 100644
--- a/src/widgets/room/messagelistdelegate.cpp
+++ b/src/widgets/room/messagelistdelegate.cpp
@@ -1,188 +1,188 @@
 /*
    Copyright (c) 2020 David Faure <faure@kde.org>
 
    This library is free software; you can redistribute it and/or modify
    it under the terms of the GNU Library General Public License as published
    by the Free Software Foundation; either version 2 of the License or
    ( at your option ) version 3 or, at the discretion of KDE e.V.
    ( which shall act as a proxy as in section 14 of the GPLv3 ), any later version.
 
    This library is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    Library General Public License for more details.
 
    You should have received a copy of the GNU Library General Public License
    along with this library; see the file COPYING.LIB.  If not, write to
    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301, USA.
 */
 
 #include "messagelistdelegate.h"
 #include "model/messagemodel.h"
 #include "ruqola.h"
 #include "rocketchataccount.h"
 
 #include <QPainter>
 #include <QPixmapCache>
 #include <QStyle>
 #include <QTextBlock>
 #include <QTextDocument>
 #include <QWindow>
 
 MessageListDelegate::MessageListDelegate(QObject *parent)
     : QItemDelegate(parent)
 {
 }
 
 static void drawRichText(QPainter *painter, const QRect &rect, const QString &text, qreal *pBaseLine)
 {
     // Possible optimisation: store the QTextDocument into the Message itself?
     QTextDocument doc;
     doc.setHtml(text);
     doc.setTextWidth(rect.width());
 
     //QStyleOptionViewItemV4 options = option;
     //initStyleOption(&options, index);
     //options.text = QString();
     //options.widget->style()->drawControl(QStyle::CE_ItemViewItem, &options, painter);
 
     painter->translate(rect.left(), rect.top());
     const QRect clip(0, 0, rect.width(), rect.height());
     doc.drawContents(painter, clip);
     painter->translate(-rect.left(), -rect.top());
 
     const qreal frameMargin = doc.frameAt(0)->frameFormat().topMargin();
     const QTextLine &line = doc.firstBlock().layout()->lineAt(0);
     *pBaseLine = rect.y() + frameMargin + line.y() + line.ascent();
 }
 
 static QString makeSenderText(const QModelIndex &index)
 {
     return QLatin1Char('@') + index.data(MessageModel::Username).toString();
 }
 
 static QString makeTimeStampText(const QModelIndex &index)
 {
     return index.data(MessageModel::Timestamp).toString();
 }
 
 static void drawTimestamp(const QModelIndex &index, QPainter *painter, const QStyleOptionViewItem &option, QRect *timeRect)
 {
     const QString timeStampText = makeTimeStampText(index);
     // This gives incorrect results (too small bounding rect), no idea why!
     //const QSize timeSize = painter->fontMetrics().boundingRect(timeStampText).size();
     const QSize timeSize(option.fontMetrics.horizontalAdvance(timeStampText), option.fontMetrics.height());
 
     *timeRect = QStyle::alignedRect(Qt::LeftToRight, Qt::AlignRight | Qt::AlignVCenter, timeSize, option.rect);
     const QPen oldPen = painter->pen();
     QColor col = painter->pen().color();
     col.setAlpha(128); // TimestampText.qml had opacity: .5
     painter->setPen(col);
     painter->drawText(*timeRect, timeStampText);
     painter->setPen(oldPen);
 
     painter->setPen(oldPen);
 }
 
 static QPixmap makeAvatarPixmap(const QModelIndex &index, int maxHeight)
 {
     const QString userId = index.data(MessageModel::UserId).toString();
     const QString iconUrlStr = Ruqola::self()->rocketChatAccount()->avatarUrl(userId);
     QPixmap pix;
     if (!QPixmapCache::find(iconUrlStr, &pix)) {
         const QUrl iconUrl(iconUrlStr);
         Q_ASSERT(iconUrl.isLocalFile());
         if (pix.load(iconUrl.toLocalFile())) {
             pix = pix.scaledToHeight(maxHeight);
             QPixmapCache::insert(iconUrlStr, pix);
         } else {
             qWarning() << "Could not load" << iconUrl.toLocalFile();
         }
     }
     return pix;
 }
 
 // [margin] <pixmap> [margin] <sender>
 static QRect layoutPixmapAndSender(const QStyleOptionViewItem &option, const QSize &senderTextSize, const QPixmap &avatarPixmap, int *pAvatarX)
 {
     const int margin = 4 * option.widget->window()->windowHandle()->devicePixelRatio();
     QRect senderRect(option.rect.x() + avatarPixmap.width() + 2 * margin, option.rect.y(),
                      senderTextSize.width(), senderTextSize.height());
     *pAvatarX = option.rect.x() + margin;
     return senderRect;
 }
 
 void MessageListDelegate::paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const
 {
     drawBackground(painter, option, index);
 
     // Compact mode : <pixmap> <sender> <message> <smiley> <timestamp>
 
     // Sender (calculate size, but don't draw it yet, we need to align vertically to the first line of the message)
     const QString senderText = makeSenderText(index);
     QFont boldFont = option.font;
     boldFont.setBold(true);
     const QFontMetrics senderFontMetrics(boldFont);
     const QSize senderTextSize = senderFontMetrics.boundingRect(senderText).size();
 
     // Pixmap (load and calculate size, but don't draw it yet, same reason)
     const QPixmap avatarPixmap = makeAvatarPixmap(index, senderTextSize.height());
     int avatarX = 0;
     const QRect senderRect = layoutPixmapAndSender(option, senderTextSize, avatarPixmap, &avatarX);
 
     // Timestamp
     QRect timeRect;
     drawTimestamp(index, painter, option, &timeRect);
 
     // Message
     QRect messageRect = option.rect;
     messageRect.setLeft(senderRect.right());
     messageRect.setRight(timeRect.left() - 1);
     const QString message = index.data(MessageModel::MessageConvertedText).toString();
     qreal baseLine = 0;
     drawRichText(painter, messageRect, message, &baseLine);
 
     // Now draw the pixmap
     painter->drawPixmap(avatarX, baseLine - senderFontMetrics.ascent(), avatarPixmap);
     // If we need support for drawing as selected, we might want to do this:
     //QRect decorationRect(option.rect.x(), topOfFirstLine, avatarPixmap.width(), avatarPixmap.height());
     //drawDecoration(painter, option, decorationRect, avatarPixmap);
 
     // Now draw the sender
     painter->setFont(boldFont);
     painter->drawText(senderRect.x(), baseLine, senderText);
     painter->setFont(option.font);
 
     //drawFocus(painter, option, displayRect);
 }
 
 QSize MessageListDelegate::sizeHint(const QStyleOptionViewItem &option, const QModelIndex &index) const
 {
     // Sender
     QFont boldFont = option.font;
     boldFont.setBold(true);
     const QFontMetrics senderFontMetrics(boldFont);
     const QSize senderTextSize = senderFontMetrics.boundingRect(makeSenderText(index)).size();
 
     // Pixmap
     const QPixmap avatarPixmap = makeAvatarPixmap(index, senderTextSize.height());
     int avatarX = 0;
     const QRect senderRect = layoutPixmapAndSender(option, senderTextSize, avatarPixmap, &avatarX);
 
     // Timestamp
     const QString timeStampText = makeTimeStampText(index);
     const QSize timeSize = option.fontMetrics.boundingRect(timeStampText).size();
 
     // Message (using the rest of the available width)
     QTextDocument doc;
     const QString message = index.data(MessageModel::MessageConvertedText).toString();
     doc.setHtml(message);
     const int widthBeforeMessage = senderRect.right();
     const int widthAfterMessage = timeSize.width();
-    doc.setTextWidth(option.rect.width() - widthBeforeMessage - widthAfterMessage);
+    doc.setTextWidth(qMax(30, option.rect.width() - widthBeforeMessage - widthAfterMessage));
 
     // hopefully the width below is never more than option.rect.width() or we'll get a scrollbar
     return QSize(widthBeforeMessage + doc.idealWidth() + widthAfterMessage,
                  qMax<int>(senderRect.height(), doc.size().height()));
 }
diff --git a/src/widgets/room/messagelistview.cpp b/src/widgets/room/messagelistview.cpp
index 27e6fde6..2dde81d2 100644
--- a/src/widgets/room/messagelistview.cpp
+++ b/src/widgets/room/messagelistview.cpp
@@ -1,43 +1,45 @@
 /*
    Copyright (c) 2020 Laurent Montel <montel@kde.org>
 
    This library is free software; you can redistribute it and/or modify
    it under the terms of the GNU Library General Public License as published
    by the Free Software Foundation; either version 2 of the License or
    ( at your option ) version 3 or, at the discretion of KDE e.V.
    ( which shall act as a proxy as in section 14 of the GPLv3 ), any later version.
 
    This library is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    Library General Public License for more details.
 
    You should have received a copy of the GNU Library General Public License
    along with this library; see the file COPYING.LIB.  If not, write to
    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301, USA.
 */
 
 #include "messagelistview.h"
 #include "ruqola.h"
 #include "rocketchataccount.h"
 #include "messagelistdelegate.h"
 #include <QDebug>
 
 MessageListView::MessageListView(QWidget *parent)
     : QListView(parent)
 {
     setItemDelegate(new MessageListDelegate(this));
+    setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+    setWordWrap(true); // so that the delegate sizeHint is called again when the width changes
 }
 
 MessageListView::~MessageListView()
 {
 
 }
 
 void MessageListView::setChannelSelected(const QString &roomId)
 {
     //TODO temporary
     Ruqola::self()->rocketChatAccount()->switchingToRoom(roomId);
     setModel(Ruqola::self()->rocketChatAccount()->messageModelForRoom(roomId));
 }