diff --git a/src/gui/MessageWidget.cpp b/src/gui/MessageWidget.cpp
index de981b92a..b3d014c33 100644
--- a/src/gui/MessageWidget.cpp
+++ b/src/gui/MessageWidget.cpp
@@ -18,20 +18,50 @@
 
 #include "MessageWidget.h"
 
-MessageWidget::MessageWidget(QWidget* parent)
-    :KMessageWidget(parent)
-{
+#include "QTimer"
 
+MessageWidget::MessageWidget(QWidget* parent)
+    : KMessageWidget(parent)
+    , m_autoHideTimer(new QTimer(this))
+    , m_autoHideTimeout(6000)
+{
+    m_autoHideTimer->setSingleShot(true);
+    connect(m_autoHideTimer, SIGNAL(timeout()), this, SLOT(animatedHide()));
+    connect(this, SIGNAL(hideAnimationFinished()), m_autoHideTimer, SLOT(stop()));
+}
+
+int MessageWidget::autoHideTimeout() const
+{
+    return m_autoHideTimeout;
 }
 
 void MessageWidget::showMessage(const QString& text, MessageWidget::MessageType type)
+{
+    showMessage(text, type, m_autoHideTimeout);
+}
+
+void MessageWidget::showMessage(const QString &text, KMessageWidget::MessageType type, int autoHideTimeout)
 {
     setMessageType(type);
     setText(text);
     animatedShow();
+    if (autoHideTimeout > 0) {
+        m_autoHideTimer->start(autoHideTimeout);
+    } else {
+        m_autoHideTimer->stop();
+    }
 }
 
 void MessageWidget::hideMessage()
 {
     animatedHide();
+    m_autoHideTimer->stop();
+}
+
+void MessageWidget::setAutoHideTimeout(int autoHideTimeout)
+{
+    m_autoHideTimeout = autoHideTimeout;
+    if (autoHideTimeout <= 0) {
+        m_autoHideTimer->stop();
+    }
 }
diff --git a/src/gui/MessageWidget.h b/src/gui/MessageWidget.h
index 03ebee3eb..4a25737b1 100644
--- a/src/gui/MessageWidget.h
+++ b/src/gui/MessageWidget.h
@@ -21,6 +21,8 @@
 
 #include "gui/KMessageWidget.h"
 
+class QTimer;
+
 class MessageWidget : public KMessageWidget
 {
     Q_OBJECT
@@ -28,10 +30,17 @@ class MessageWidget : public KMessageWidget
 public:
     explicit MessageWidget(QWidget* parent = 0);
 
+    int autoHideTimeout() const;
+
 public slots:
     void showMessage(const QString& text, MessageWidget::MessageType type);
+    void showMessage(const QString& text, MessageWidget::MessageType type, int autoHideTimeout);
     void hideMessage();
+    void setAutoHideTimeout(int autoHideTimeout);
 
+private:
+    QTimer* m_autoHideTimer;
+    int m_autoHideTimeout;
 };
 
 #endif // MESSAGEWIDGET_H
diff --git a/src/http/OptionDialog.cpp b/src/http/OptionDialog.cpp
index 9fb66bd6f..b0823c7b4 100644
--- a/src/http/OptionDialog.cpp
+++ b/src/http/OptionDialog.cpp
@@ -35,6 +35,7 @@ OptionDialog::OptionDialog(QWidget *parent) :
     m_ui->warningWidget->showMessage(tr("The following options can be dangerous!\nChange them only if you know what you are doing."), MessageWidget::Warning);
     m_ui->warningWidget->setIcon(FilePath::instance()->icon("status", "dialog-warning"));
     m_ui->warningWidget->setCloseButtonVisible(false);
+    m_ui->warningWidget->setAutoHideTimeout(-1);
 
     m_ui->tabWidget->setEnabled(m_ui->enableHttpServer->isChecked());
     connect(m_ui->enableHttpServer, SIGNAL(toggled(bool)), m_ui->tabWidget, SLOT(setEnabled(bool)));