diff --git a/plugins/dockers/logdocker/LogDocker.cpp b/plugins/dockers/logdocker/LogDocker.cpp
index 577c2fce18..e65a9e4a3d 100644
--- a/plugins/dockers/logdocker/LogDocker.cpp
+++ b/plugins/dockers/logdocker/LogDocker.cpp
@@ -1,80 +1,80 @@
 /*
 *  Copyright (c) 2018 Boudewijn Rempt <boud@valdyas.org>
  *
  *  This library is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; version 2.1 of the License.
  *
  *  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 Lesser General Public License for more details.
  *
  *  You should have received a copy of the GNU Lesser 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.
  */
 
 #include "LogDocker.h"
 
 #include <kpluginfactory.h>
 #include <klocalizedstring.h>
 
 #include <KoDockFactoryBase.h>
 #include <KoDockRegistry.h>
 
 #include "LogDockerDock.h"
 
 K_PLUGIN_FACTORY_WITH_JSON(LogDockerPluginFactory,
                            "krita_logdocker.json",
                            registerPlugin<LogDockerPlugin>();)
 
 class LogDockerDockFactory : public KoDockFactoryBase {
 public:
     LogDockerDockFactory()
     {
     }
 
     virtual ~LogDockerDockFactory()
     {
     }
 
     QString id() const override
     {
         return QString( "LogDocker" );
     }
 
     virtual Qt::DockWidgetArea defaultDockWidgetArea() const
     {
         return Qt::RightDockWidgetArea;
     }
 
     QDockWidget* createDockWidget() override
     {
-        LogDockerDock * dockWidget = new LogDockerDock();
+                                        LogDockerDock * dockWidget = new LogDockerDock();
         dockWidget->setObjectName(id());
 
         return dockWidget;
     }
 
     DockPosition defaultDockPosition() const override
     {
         return DockMinimized;
     }
 private:
 
 
 };
 
 
 LogDockerPlugin::LogDockerPlugin(QObject *parent, const QVariantList &)
     : QObject(parent)
 {
     KoDockRegistry::instance()->add(new LogDockerDockFactory());
 }
 
 LogDockerPlugin::~LogDockerPlugin()
 {
 }
 
 #include "LogDocker.moc"
diff --git a/plugins/dockers/logdocker/LogDockerDock.cpp b/plugins/dockers/logdocker/LogDockerDock.cpp
index 9052878cad..8444883c32 100644
--- a/plugins/dockers/logdocker/LogDockerDock.cpp
+++ b/plugins/dockers/logdocker/LogDockerDock.cpp
@@ -1,51 +1,166 @@
 /*
  *  Copyright (c) 2018 Boudewijn Rempt <boud@valdyas.org>
  *
  *  This library is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; version 2.1 of the License.
  *
  *  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 Lesser General Public License for more details.
  *
  *  You should have received a copy of the GNU Lesser 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.
  */
 
 #include "LogDockerDock.h"
 
 #include <QHBoxLayout>
 #include <QToolButton>
+#include <QScrollBar>
+#include <QStandardPaths>
+#include <QDateTime>
+#include <QTableWidget>
 
 #include <klocalizedstring.h>
 
+#include <KoDialog.h>
 #include <KoCanvasBase.h>
+#include <KoIcon.h>
+#include <KoFileDialog.h>
 
 #include "kis_canvas2.h"
 #include "KisViewManager.h"
+#include "kis_config.h"
 
-#include <KoIcon.h>
+QTextEdit *LogDockerDock::s_textEdit {0};
+QTextCharFormat LogDockerDock::s_debug;
+QTextCharFormat LogDockerDock::s_info;
+QTextCharFormat LogDockerDock::s_warning;
+QTextCharFormat LogDockerDock::s_critical;
+QTextCharFormat LogDockerDock::s_fatal;
 
 LogDockerDock::LogDockerDock( )
     : QDockWidget(i18n("Log Viewer"))
 {
     QWidget *page = new QWidget(this);
     setupUi(page);
+    setWidget(page);
+
+    s_textEdit = txtLogViewer;
+
     bnToggle->setIcon(koIcon("view-list-text"));
+    connect(bnToggle, SIGNAL(clicked(bool)), SLOT(toggleLogging(bool)));
+    bnToggle->setChecked(KisConfig().readEntry<bool>("logviewer_enabled", false));
+    toggleLogging(KisConfig().readEntry<bool>("logviewer_enabled", false));
+
     bnClear->setIcon(koIcon("edit-clear"));
-    bnSave->setIcon(koIcon("filesave"));
+    connect(bnClear, SIGNAL(clicked(bool)), SLOT(clearLog()));
+
+    bnSave->setIcon(koIcon("document-save"));
+    connect(bnSave, SIGNAL(clicked(bool)), SLOT(saveLog()));
+
     bnSettings->setIcon(koIcon("settings"));
+    connect(bnSettings, SIGNAL(clicked(bool)), SLOT(settings()));
+
+    s_debug.setForeground(Qt::white);
+    s_info.setForeground(Qt::yellow);
+    s_warning.setForeground(QColor(255, 80, 0));
+    s_critical.setForeground(Qt::red);
+    s_fatal.setForeground(Qt::red);
+    s_fatal.setFontWeight(QFont::Bold);
 }
 
 void LogDockerDock::setCanvas(KoCanvasBase *canvas)
 {
     Q_UNUSED(canvas);
     setEnabled(true);
 
 }
 
+void LogDockerDock::toggleLogging(bool toggle)
+{
+    KisConfig().writeEntry<bool>("logviewer_enabled", toggle);
+    if (toggle) {
+        qInstallMessageHandler(messageHandler);
+    }
+    else {
+        qInstallMessageHandler(0);
+    }
+
+}
+
+void LogDockerDock::clearLog()
+{
+    txtLogViewer->document()->clear();
+}
+
+void LogDockerDock::saveLog()
+{
+    KoFileDialog fileDialog(this, KoFileDialog::SaveFile, "logfile");
+    fileDialog.setDefaultDir(QStandardPaths::writableLocation(QStandardPaths::DesktopLocation) + "/" + QString("krita_%1.log").arg(QDateTime::currentDateTime().toString()));
+    QString filename = fileDialog.filename();
+    if (!filename.isEmpty()) {
+        QFile f(filename);
+        f.open(QFile::WriteOnly);
+        f.write(txtLogViewer->document()->toPlainText().toUtf8());
+        f.close();
+    }
+}
+
+void LogDockerDock::settings()
+{
+    KoDialog dlg(this);
+    dlg.setButtons(KoDialog::Ok | KoDialog::Cancel);
+    dlg.setCaption(i18n("Log Settings"));
+
+    QTableWidget *page = new QTableWidget(18, 6, &dlg);
+    dlg.setMainWidget(page);
+
+    page->setHorizontalHeaderItem(0, new QTableWidgetItem(i18n("Category")));
+    page->setHorizontalHeaderItem(1, new QTableWidgetItem(i18n("Debug")));
+    page->setHorizontalHeaderItem(2, new QTableWidgetItem(i18n("Info")));
+    page->setHorizontalHeaderItem(3, new QTableWidgetItem(i18n("Warning")));
+    page->setHorizontalHeaderItem(4, new QTableWidgetItem(i18n("Critical")));
+    page->setHorizontalHeaderItem(4, new QTableWidgetItem(i18n("Fatal")));
+
+    if (dlg.exec()) {
+        // Apply the new settings
+    }
+
+}
+
+void LogDockerDock::messageHandler(QtMsgType type, const QMessageLogContext &/*context*/, const QString &msg)
+{
+    QTextDocument *doc = s_textEdit->document();
+    QTextCursor cursor(doc);
+    cursor.movePosition(QTextCursor::End, QTextCursor::MoveAnchor);
+    cursor.beginEditBlock();
+
+    QByteArray localMsg = msg.toLocal8Bit();
+    switch (type) {
+    case QtDebugMsg:
+        cursor.insertText(msg + "\n", s_debug);
+        break;
+    case QtInfoMsg:
+        cursor.insertText(msg + "\n", s_info);
+        break;
+    case QtWarningMsg:
+        cursor.insertText(msg + "\n", s_warning);
+        break;
+    case QtCriticalMsg:
+        cursor.insertText(msg + "\n", s_critical);
+        break;
+    case QtFatalMsg:
+        cursor.insertText(msg + "\n", s_fatal);
+        break;
+    }
+
+    cursor.endEditBlock();
+    s_textEdit->verticalScrollBar()->setValue(s_textEdit->verticalScrollBar()->maximum());
+}
+
 
 
diff --git a/plugins/dockers/logdocker/LogDockerDock.h b/plugins/dockers/logdocker/LogDockerDock.h
index ef848acf57..fe5c663d13 100644
--- a/plugins/dockers/logdocker/LogDockerDock.h
+++ b/plugins/dockers/logdocker/LogDockerDock.h
@@ -1,40 +1,54 @@
 /*
  *  Copyright (c) 2018 Boudewijn Rempt <boud@valdyas.org>
  *
  *  This library is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; version 2.1 of the License.
  *
  *  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 Lesser General Public License for more details.
  *
  *  You should have received a copy of the GNU Lesser 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.
  */
 
 #ifndef _LOGDOCKER_DOCK_H_
 #define _LOGDOCKER_DOCK_H_
 
 #include <QDockWidget>
 
 #include <KoCanvasObserverBase.h>
 
 #include "ui_WdgLogDocker.h"
 
 class LogDockerDock : public QDockWidget, public KoCanvasObserverBase, public Ui_WdgLogDocker {
     Q_OBJECT
 public:
     LogDockerDock( );
     QString observerName() override { return "LogDockerDock"; }
     void setCanvas(KoCanvasBase *canvas) override;
     void unsetCanvas() override {}
 
 private Q_SLOTS:
+
+    void toggleLogging(bool toggle);
+    void clearLog();
+    void saveLog();
+    void settings();
+
 private:
+    static QTextEdit *s_textEdit;
+    static QTextCharFormat s_debug;
+    static QTextCharFormat s_info;
+    static QTextCharFormat s_warning;
+    static QTextCharFormat s_critical;
+    static QTextCharFormat s_fatal;
+    static void messageHandler(QtMsgType type, const QMessageLogContext &context, const QString &msg);
+
 };
 
 
 #endif
diff --git a/plugins/dockers/logdocker/WdgLogDocker.ui b/plugins/dockers/logdocker/WdgLogDocker.ui
index db1a042c4a..defa50ab39 100644
--- a/plugins/dockers/logdocker/WdgLogDocker.ui
+++ b/plugins/dockers/logdocker/WdgLogDocker.ui
@@ -1,87 +1,104 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>WdgLogDocker</class>
  <widget class="QWidget" name="WdgLogDocker">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>400</width>
     <height>260</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>Form</string>
   </property>
   <layout class="QGridLayout" name="gridLayout">
    <item row="0" column="0">
-    <widget class="QTextBrowser" name="txtLogViewer"/>
+    <widget class="QTextEdit" name="txtLogViewer">
+     <property name="undoRedoEnabled">
+      <bool>false</bool>
+     </property>
+     <property name="lineWrapMode">
+      <enum>QTextEdit::NoWrap</enum>
+     </property>
+     <property name="readOnly">
+      <bool>true</bool>
+     </property>
+     <property name="html">
+      <string notr="true">&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
+&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Droid Sans'; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+     </property>
+    </widget>
    </item>
    <item row="1" column="0">
     <layout class="QHBoxLayout" name="horizontalLayout">
      <item>
       <widget class="QToolButton" name="bnToggle">
        <property name="enabled">
-        <bool>false</bool>
+        <bool>true</bool>
        </property>
        <property name="toolTip">
         <string>Enable Logging</string>
        </property>
        <property name="text">
         <string>...</string>
        </property>
        <property name="checkable">
         <bool>true</bool>
        </property>
       </widget>
      </item>
      <item>
       <widget class="QToolButton" name="bnClear">
        <property name="toolTip">
         <string>Clear the log</string>
        </property>
        <property name="text">
         <string>...</string>
        </property>
       </widget>
      </item>
      <item>
       <widget class="QToolButton" name="bnSave">
        <property name="toolTip">
         <string>Save the log</string>
        </property>
        <property name="text">
         <string>...</string>
        </property>
       </widget>
      </item>
      <item>
       <spacer name="horizontalSpacer">
        <property name="orientation">
         <enum>Qt::Horizontal</enum>
        </property>
        <property name="sizeHint" stdset="0">
         <size>
          <width>40</width>
          <height>20</height>
         </size>
        </property>
       </spacer>
      </item>
      <item>
       <widget class="QToolButton" name="bnSettings">
        <property name="toolTip">
         <string>Configure Logging</string>
        </property>
        <property name="text">
         <string>...</string>
        </property>
       </widget>
      </item>
     </layout>
    </item>
   </layout>
  </widget>
  <resources/>
  <connections/>
 </ui>