diff --git a/app/savebar.cpp b/app/savebar.cpp
index cce25769..cbef3f8e 100644
--- a/app/savebar.cpp
+++ b/app/savebar.cpp
@@ -1,369 +1,371 @@
 // vim: set tabstop=4 shiftwidth=4 expandtab:
 /*
 Gwenview: an image viewer
 Copyright 2007 Aurélien Gâteau <agateau@kde.org>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
 as published by the Free Software Foundation; either version 2
 of the License, or (at your option) any later version.
 
 This program 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 General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
 Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
 */
 // Self
 #include "savebar.h"
 
 // Qt
 #include <QHBoxLayout>
 #include <QLabel>
 #include <QToolButton>
 #include <QToolTip>
 #include <QDebug>
 #include <QIcon>
 #include <QUrl>
 
 // KDE
 #include <KActionCollection>
 #include <KColorScheme>
 #include <KIconLoader>
 #include <KLocalizedString>
 
 // Local
 #include "lib/document/documentfactory.h"
 #include "lib/gwenviewconfig.h"
 #include "lib/memoryutils.h"
 #include "lib/paintutils.h"
 
 namespace Gwenview
 {
 
 QToolButton* createToolButton()
 {
     QToolButton* button = new QToolButton;
     button->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
     button->hide();
     return button;
 }
 
 struct SaveBarPrivate
 {
     SaveBar* q;
     KActionCollection* mActionCollection;
     QWidget* mSaveBarWidget;
     QWidget* mTopRowWidget;
     QToolButton* mUndoButton;
     QToolButton* mRedoButton;
     QToolButton* mSaveCurrentUrlButton;
     QToolButton* mSaveAsButton;
     QToolButton* mSaveAllButton;
     QToolButton* mSaveAllFullScreenButton;
     QLabel* mMessageLabel;
     QLabel* mActionsLabel;
     QFrame* mTooManyChangesFrame;
     QUrl mCurrentUrl;
 
     void createTooManyChangesFrame()
     {
         mTooManyChangesFrame = new QFrame;
 
         // Icon
         QLabel* iconLabel = new QLabel;
         QPixmap pix = KIconLoader::global()->loadIcon(
                           "dialog-warning", KIconLoader::Dialog, KIconLoader::SizeSmall);
         iconLabel->setPixmap(pix);
 
         // Text label
         QLabel* textLabel = new QLabel;
         textLabel->setText(
             i18n("You have modified many images. To avoid memory problems, you should save your changes.")
         );
 
         mSaveAllFullScreenButton = createToolButton();
 
         // Layout
         QHBoxLayout* layout = new QHBoxLayout(mTooManyChangesFrame);
         layout->setMargin(0);
         layout->addWidget(iconLabel);
         layout->addWidget(textLabel);
         layout->addWidget(mSaveAllFullScreenButton);
         mTooManyChangesFrame->hide();
 
         // CSS
         KColorScheme scheme(mSaveBarWidget->palette().currentColorGroup(), KColorScheme::Window);
         QColor warningBackgroundColor = scheme.background(KColorScheme::NegativeBackground).color();
         QColor warningBorderColor = PaintUtils::adjustedHsv(warningBackgroundColor, 0, 150, 0);
         QColor warningColor = scheme.foreground(KColorScheme::NegativeText).color();
 
         QString css =
             ".QFrame {"
             "	background-color: %1;"
             "	border: 1px solid %2;"
             "	border-radius: 4px;"
             "	padding: 3px;"
             "}"
             ".QFrame QLabel {"
             "	color: %3;"
             "}"
             ;
         css = css
               .arg(warningBackgroundColor.name())
               .arg(warningBorderColor.name())
               .arg(warningColor.name())
               ;
         mTooManyChangesFrame->setStyleSheet(css);
     }
 
     void applyNormalStyleSheet()
     {
         QColor bgColor = QToolTip::palette().base().color();
         QColor borderColor = PaintUtils::adjustedHsv(bgColor, 0, 150, 0);
         QColor fgColor = QToolTip::palette().text().color();
 
         QString css =
             "#saveBarWidget {"
             "	background-color: %1;"
             "	border-top: 1px solid %2;"
             "	border-bottom: 1px solid %2;"
             "	color: %3;"
             "}"
             ;
 
         css = css
               .arg(bgColor.name())
               .arg(borderColor.name())
               .arg(fgColor.name())
               ;
         mSaveBarWidget->setStyleSheet(css);
     }
 
     void applyFullScreenStyleSheet()
     {
         QString css =
             "#saveBarWidget {"
             "	background-color: #333;"
             "}";
         mSaveBarWidget->setStyleSheet(css);
     }
 
     void updateTooManyChangesFrame(const QList<QUrl>& list)
     {
         qreal maxPercentageOfMemoryUsage = GwenviewConfig::percentageOfMemoryUsageWarning();
         qulonglong maxMemoryUsage = MemoryUtils::getTotalMemory() * maxPercentageOfMemoryUsage;
         qulonglong memoryUsage = 0;
         Q_FOREACH(const QUrl &url, list) {
             Document::Ptr doc = DocumentFactory::instance()->load(url);
             memoryUsage += doc->memoryUsage();
         }
 
         mTooManyChangesFrame->setVisible(memoryUsage > maxMemoryUsage);
     }
 
     void updateTopRowWidget(const QList<QUrl>& lst)
     {
         QStringList links;
         QString message;
 
         if (lst.contains(mCurrentUrl)) {
             message = i18n("Current image modified");
 
             mUndoButton->show();
             mRedoButton->show();
 
             if (lst.size() > 1) {
                 QString previous = i18n("Previous modified image");
                 QString next = i18n("Next modified image");
                 if (mCurrentUrl == lst[0]) {
                     links << previous;
                 } else {
                     links << QString("<a href='previous'>%1</a>").arg(previous);
                 }
                 if (mCurrentUrl == lst[lst.size() - 1]) {
                     links << next;
                 } else {
                     links << QString("<a href='next'>%1</a>").arg(next);
                 }
             }
         } else {
             mUndoButton->hide();
             mRedoButton->hide();
 
             message = i18np("One image modified", "%1 images modified", lst.size());
             if (lst.size() > 1) {
                 links << QString("<a href='first'>%1</a>").arg(i18n("Go to first modified image"));
             } else {
                 links << QString("<a href='first'>%1</a>").arg(i18n("Go to it"));
             }
         }
 
         mSaveCurrentUrlButton->setVisible(lst.contains(mCurrentUrl));
         mSaveAsButton->setVisible(lst.contains(mCurrentUrl));
         mSaveAllButton->setVisible(lst.size() >= 1);
 
         mMessageLabel->setText(message);
+        mMessageLabel->setMaximumWidth(mMessageLabel->minimumSizeHint().width());
         mActionsLabel->setText(links.join(" | "));
     }
 
     void updateWidgetSizes()
     {
         QVBoxLayout* layout = static_cast<QVBoxLayout*>(mSaveBarWidget->layout());
         int topRowHeight = q->window()->isFullScreen() ? 0 : mTopRowWidget->height();
         int bottomRowHeight = mTooManyChangesFrame->isVisibleTo(mSaveBarWidget) ? mTooManyChangesFrame->sizeHint().height() : 0;
 
         int height = 2 * layout->margin() + topRowHeight + bottomRowHeight;
         if (topRowHeight > 0 && bottomRowHeight > 0) {
             height += layout->spacing();
         }
         mSaveBarWidget->setFixedHeight(height);
     }
 };
 
 SaveBar::SaveBar(QWidget* parent, KActionCollection* actionCollection)
 : SlideContainer(parent)
 , d(new SaveBarPrivate)
 {
     d->q = this;
     d->mActionCollection = actionCollection;
     d->mSaveBarWidget = new QWidget();
     d->mSaveBarWidget->setObjectName(QLatin1String("saveBarWidget"));
     d->applyNormalStyleSheet();
 
     d->mMessageLabel = new QLabel;
-    d->mMessageLabel->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed);
+    d->mMessageLabel->setSizePolicy(QSizePolicy::Ignored, QSizePolicy::Fixed);
 
     d->mUndoButton = createToolButton();
     d->mRedoButton = createToolButton();
     d->mSaveCurrentUrlButton = createToolButton();
     d->mSaveAsButton = createToolButton();
     d->mSaveAllButton = createToolButton();
 
     d->mActionsLabel = new QLabel;
     d->mActionsLabel->setAlignment(Qt::AlignCenter);
-    d->mActionsLabel->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
+    d->mActionsLabel->setSizePolicy(QSizePolicy::Ignored, QSizePolicy::Fixed);
 
     d->createTooManyChangesFrame();
 
     // Setup top row
     d->mTopRowWidget = new QWidget;
     QHBoxLayout* rowLayout = new QHBoxLayout(d->mTopRowWidget);
     rowLayout->addWidget(d->mMessageLabel);
+    rowLayout->setStretchFactor(d->mMessageLabel, 1);
     rowLayout->addWidget(d->mUndoButton);
     rowLayout->addWidget(d->mRedoButton);
     rowLayout->addWidget(d->mActionsLabel);
     rowLayout->addWidget(d->mSaveCurrentUrlButton);
     rowLayout->addWidget(d->mSaveAsButton);
     rowLayout->addWidget(d->mSaveAllButton);
     rowLayout->setMargin(0);
 
     // Setup bottom row
     QHBoxLayout* bottomRowLayout = new QHBoxLayout;
     bottomRowLayout->addStretch();
     bottomRowLayout->addWidget(d->mTooManyChangesFrame);
     bottomRowLayout->addStretch();
 
     // Gather everything together
     QVBoxLayout* layout = new QVBoxLayout(d->mSaveBarWidget);
     layout->addWidget(d->mTopRowWidget);
     layout->addLayout(bottomRowLayout);
     layout->setMargin(3);
     layout->setSpacing(3);
 
     setContent(d->mSaveBarWidget);
 
     connect(DocumentFactory::instance(), SIGNAL(modifiedDocumentListChanged()),
             SLOT(updateContent()));
 
     connect(d->mActionsLabel, &QLabel::linkActivated, this, &SaveBar::triggerAction);
 }
 
 SaveBar::~SaveBar()
 {
     delete d;
 }
 
 void SaveBar::initActionDependentWidgets()
 {
     d->mUndoButton->setDefaultAction(d->mActionCollection->action("edit_undo"));
     d->mRedoButton->setDefaultAction(d->mActionCollection->action("edit_redo"));
     d->mSaveCurrentUrlButton->setDefaultAction(d->mActionCollection->action("file_save"));
     d->mSaveAsButton->setDefaultAction(d->mActionCollection->action("file_save_as"));
 
     // FIXME: Not using an action for now
     d->mSaveAllButton->setText(i18n("Save All"));
     d->mSaveAllButton->setIcon(QIcon::fromTheme("document-save-all"));
     connect(d->mSaveAllButton, &QToolButton::clicked, this, &SaveBar::requestSaveAll);
 
     d->mSaveAllFullScreenButton->setText(i18n("Save All"));
     connect(d->mSaveAllFullScreenButton, &QToolButton::clicked, this, &SaveBar::requestSaveAll);
 
     int height = d->mUndoButton->sizeHint().height();
     d->mTopRowWidget->setFixedHeight(height);
     d->updateWidgetSizes();
 }
 
 void SaveBar::setFullScreenMode(bool isFullScreen)
 {
     d->mSaveAllFullScreenButton->setVisible(isFullScreen);
     if (isFullScreen) {
         d->applyFullScreenStyleSheet();
     } else {
         d->applyNormalStyleSheet();
     }
     updateContent();
 }
 
 void SaveBar::updateContent()
 {
     QList<QUrl> lst = DocumentFactory::instance()->modifiedDocumentList();
 
     if (window()->isFullScreen()) {
         d->mTopRowWidget->hide();
     } else {
         d->mTopRowWidget->show();
         d->updateTopRowWidget(lst);
     }
 
     d->updateTooManyChangesFrame(lst);
 
     d->updateWidgetSizes();
     if (lst.isEmpty() || (window()->isFullScreen() && !d->mTooManyChangesFrame->isVisibleTo(d->mSaveBarWidget))) {
         slideOut();
     } else {
         slideIn();
     }
 }
 
 void SaveBar::triggerAction(const QString& action)
 {
     QList<QUrl> lst = DocumentFactory::instance()->modifiedDocumentList();
     if (action == "first") {
         goToUrl(lst[0]);
     } else if (action == "previous") {
         int pos = lst.indexOf(d->mCurrentUrl);
         --pos;
         Q_ASSERT(pos >= 0);
         goToUrl(lst[pos]);
     } else if (action == "next") {
         int pos = lst.indexOf(d->mCurrentUrl);
         ++pos;
         Q_ASSERT(pos < lst.size());
         goToUrl(lst[pos]);
     } else {
         qWarning() << "Unknown action: " << action ;
     }
 }
 
 void SaveBar::setCurrentUrl(const QUrl &url)
 {
     d->mCurrentUrl = url;
     updateContent();
 }
 
 } // namespace
diff --git a/lib/slidecontainer.cpp b/lib/slidecontainer.cpp
index 9a5ffa18..57f7a7c8 100644
--- a/lib/slidecontainer.cpp
+++ b/lib/slidecontainer.cpp
@@ -1,160 +1,167 @@
 /*
 Gwenview: an image viewer
 Copyright 2007 Aurélien Gâteau <agateau@kde.org>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
 as published by the Free Software Foundation; either version 2
 of the License, or (at your option) any later version.
 
 This program 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 General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
 Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 */
 // Self
 #include "slidecontainer.h"
 
 // KDE
 
 // Qt
 #include <QEvent>
 #include <QPropertyAnimation>
 #include <QResizeEvent>
 
 namespace Gwenview
 {
 
 static const int SLIDE_DURATION = 250;
 
 SlideContainer::SlideContainer(QWidget* parent)
 : QFrame(parent)
 {
     mContent = 0;
     mSlidingOut = false;
     setFixedHeight(0);
 }
 
 QWidget* SlideContainer::content() const
 {
     return mContent;
 }
 
 void SlideContainer::setContent(QWidget* content)
 {
     if (mContent) {
         mContent->setParent(0);
         mContent->removeEventFilter(this);
     }
     mContent = content;
     if (mContent) {
         mContent->setParent(this);
         mContent->installEventFilter(this);
         mContent->hide();
     }
 }
 
 void SlideContainer::animTo(int newHeight)
 {
     delete mAnim.data();
     QPropertyAnimation* anim = new QPropertyAnimation(this, "slideHeight", this);
     anim->setDuration(SLIDE_DURATION);
     anim->setStartValue(slideHeight());
     anim->setEndValue(newHeight);
     anim->start(QAbstractAnimation::DeleteWhenStopped);
     connect(anim, &QPropertyAnimation::finished, this, &SlideContainer::slotAnimFinished);
     mAnim = anim;
 }
 
 void SlideContainer::slideIn()
 {
     mSlidingOut = false;
     mContent->show();
     mContent->adjustSize();
     delete mAnim.data();
     if (height() == mContent->height()) {
         return;
     }
     animTo(mContent->height());
 }
 
 void SlideContainer::slideOut()
 {
     if (height() == 0) {
         return;
     }
     mSlidingOut = true;
     animTo(0);
 }
 
 QSize SlideContainer::sizeHint() const
 {
     if (mContent) {
         return mContent->sizeHint();
     } else {
         return QSize();
     }
 }
 
 QSize SlideContainer::minimumSizeHint() const
 {
     if (mContent) {
         return mContent->minimumSizeHint();
     } else {
         return QSize();
     }
 }
 
 void SlideContainer::resizeEvent(QResizeEvent* event)
 {
     if (mContent) {
         if (event->oldSize().width() != width()) {
             adjustContentGeometry();
         }
     }
 }
 
 void SlideContainer::adjustContentGeometry()
 {
     if (mContent) {
         mContent->setGeometry(0, height() - mContent->height(), width(), mContent->height());
     }
 }
 
 bool SlideContainer::eventFilter(QObject*, QEvent* event)
 {
-    if (event->type() == QEvent::Resize) {
+    switch (event->type()) {
+    case QEvent::Resize:
         if (!mSlidingOut && height() != 0) {
             animTo(mContent->height());
         }
+        break;
+    case QEvent::LayoutRequest:
+        updateGeometry();
+        break;
+    default:
+        break;
     }
     return false;
 }
 
 int SlideContainer::slideHeight() const
 {
     return isVisible() ? height() : 0;
 }
 
 void SlideContainer::setSlideHeight(int value)
 {
     setFixedHeight(value);
     adjustContentGeometry();
 }
 
 void SlideContainer::slotAnimFinished()
 {
     if (height() == 0) {
         mSlidingOut = false;
         slidedOut();
     } else {
         slidedIn();
     }
 }
 
 } // namespace