diff --git a/src/widgets/krichtextedit.cpp b/src/widgets/krichtextedit.cpp
index 220d671..d4f315f 100644
--- a/src/widgets/krichtextedit.cpp
+++ b/src/widgets/krichtextedit.cpp
@@ -1,574 +1,576 @@
 /*
  * krichtextedit
  *
  * Copyright 2007 Laurent Montel <montel@kde.org>
  * Copyright 2008 Thomas McGuire <thomas.mcguire@gmx.net>
  * Copyright 2008 Stephen Kelly  <steveire@gmail.com>
  *
  * 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; either
  * version 2.1 of the License, or (at your option) 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
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301  USA
  */
 
 #include "krichtextedit.h"
 
 // Own includes
 #include "nestedlisthelper_p.h"
 #include "klinkdialog_p.h"
 
 // kdelibs includes
 #include <kcursor.h>
 #include <kcolorscheme.h>
 
 // Qt includes
 #include <QRegularExpression>
 
 /**
   Private class that helps to provide binary compatibility between releases.
   @internal
 */
 //@cond PRIVATE
 class KRichTextEditPrivate : public QObject
 {
 public:
     explicit KRichTextEditPrivate(KRichTextEdit *parent)
         : q(parent),
           mMode(KRichTextEdit::Plain)
     {
         nestedListHelper = new NestedListHelper(q);
     }
 
     ~KRichTextEditPrivate()
     {
         delete nestedListHelper;
     }
 
     //
     // Normal functions
     //
 
     // If the text under the cursor is a link, the cursor's selection is set to
     // the complete link text. Otherwise selects the current word if there is no
     // selection.
     void selectLinkText() const;
 
     void init();
 
     // Switches to rich text mode and emits the mode changed signal if the
     // mode really changed.
     void activateRichText();
 
     // Applies formatting to the current word if there is no selection.
     void mergeFormatOnWordOrSelection(const QTextCharFormat &format);
 
     void setTextCursor(QTextCursor &cursor);
 
     // Data members
 
     KRichTextEdit *q;
     KRichTextEdit::Mode mMode;
 
     NestedListHelper *nestedListHelper;
 
 };
 
 void KRichTextEditPrivate::activateRichText()
 {
     if (mMode == KRichTextEdit::Plain) {
         q->setAcceptRichText(true);
         mMode = KRichTextEdit::Rich;
         emit q->textModeChanged(mMode);
     }
 }
 
 void KRichTextEditPrivate::setTextCursor(QTextCursor &cursor)
 {
     q->setTextCursor(cursor);
 }
 
 void KRichTextEditPrivate::mergeFormatOnWordOrSelection(const QTextCharFormat &format)
 {
     QTextCursor cursor = q->textCursor();
     QTextCursor wordStart(cursor);
     QTextCursor wordEnd(cursor);
 
     wordStart.movePosition(QTextCursor::StartOfWord);
     wordEnd.movePosition(QTextCursor::EndOfWord);
 
     cursor.beginEditBlock();
     if (!cursor.hasSelection() && cursor.position() != wordStart.position() && cursor.position() != wordEnd.position()) {
         cursor.select(QTextCursor::WordUnderCursor);
     }
     cursor.mergeCharFormat(format);
     q->mergeCurrentCharFormat(format);
     cursor.endEditBlock();
 }
 //@endcond
 
 KRichTextEdit::KRichTextEdit(const QString &text, QWidget *parent)
     : KTextEdit(text, parent), d(new KRichTextEditPrivate(this))
 {
     d->init();
 }
 
 KRichTextEdit::KRichTextEdit(QWidget *parent)
     : KTextEdit(parent), d(new KRichTextEditPrivate(this))
 {
     d->init();
 }
 
 KRichTextEdit::~KRichTextEdit()
 {
     delete d;
 }
 
 //@cond PRIVATE
 void KRichTextEditPrivate::init()
 {
     q->setAcceptRichText(false);
     KCursor::setAutoHideCursor(q, true, true);
 }
 //@endcond
 
 void KRichTextEdit::setListStyle(int _styleIndex)
 {
     d->nestedListHelper->handleOnBulletType(-_styleIndex);
     setFocus();
     d->activateRichText();
 }
 
 void KRichTextEdit::indentListMore()
 {
     d->nestedListHelper->handleOnIndentMore();
     d->activateRichText();
 }
 
 void KRichTextEdit::indentListLess()
 {
     d->nestedListHelper->handleOnIndentLess();
 }
 
 void KRichTextEdit::insertHorizontalRule()
 {
     QTextCursor cursor = textCursor();
     QTextBlockFormat bf = cursor.blockFormat();
     QTextCharFormat cf = cursor.charFormat();
 
     cursor.beginEditBlock();
     cursor.insertHtml(QStringLiteral("<hr>"));
     cursor.insertBlock(bf, cf);
     setTextCursor(cursor);
     d->activateRichText();
     cursor.endEditBlock();
 }
 
 void KRichTextEdit::alignLeft()
 {
     setAlignment(Qt::AlignLeft);
     setFocus();
     d->activateRichText();
 }
 
 void KRichTextEdit::alignCenter()
 {
     setAlignment(Qt::AlignHCenter);
     setFocus();
     d->activateRichText();
 }
 
 void KRichTextEdit::alignRight()
 {
     setAlignment(Qt::AlignRight);
     setFocus();
     d->activateRichText();
 }
 
 void KRichTextEdit::alignJustify()
 {
     setAlignment(Qt::AlignJustify);
     setFocus();
     d->activateRichText();
 }
 
 void KRichTextEdit::makeRightToLeft()
 {
     QTextBlockFormat format;
     format.setLayoutDirection(Qt::RightToLeft);
     QTextCursor cursor = textCursor();
     cursor.mergeBlockFormat(format);
     setTextCursor(cursor);
     setFocus();
     d->activateRichText();
 }
 
 void KRichTextEdit::makeLeftToRight()
 {
     QTextBlockFormat format;
     format.setLayoutDirection(Qt::LeftToRight);
     QTextCursor cursor = textCursor();
     cursor.mergeBlockFormat(format);
     setTextCursor(cursor);
     setFocus();
     d->activateRichText();
 }
 
 void KRichTextEdit::setTextBold(bool bold)
 {
     QTextCharFormat fmt;
     fmt.setFontWeight(bold ? QFont::Bold : QFont::Normal);
     d->mergeFormatOnWordOrSelection(fmt);
     setFocus();
     d->activateRichText();
 }
 
 void KRichTextEdit::setTextItalic(bool italic)
 {
     QTextCharFormat fmt;
     fmt.setFontItalic(italic);
     d->mergeFormatOnWordOrSelection(fmt);
     setFocus();
     d->activateRichText();
 }
 
 void KRichTextEdit::setTextUnderline(bool underline)
 {
     QTextCharFormat fmt;
     fmt.setFontUnderline(underline);
     d->mergeFormatOnWordOrSelection(fmt);
     setFocus();
     d->activateRichText();
 }
 
 void KRichTextEdit::setTextStrikeOut(bool strikeOut)
 {
     QTextCharFormat fmt;
     fmt.setFontStrikeOut(strikeOut);
     d->mergeFormatOnWordOrSelection(fmt);
     setFocus();
     d->activateRichText();
 }
 
 void KRichTextEdit::setTextForegroundColor(const QColor &color)
 {
     QTextCharFormat fmt;
     fmt.setForeground(color);
     d->mergeFormatOnWordOrSelection(fmt);
     setFocus();
     d->activateRichText();
 }
 
 void KRichTextEdit::setTextBackgroundColor(const QColor &color)
 {
     QTextCharFormat fmt;
     fmt.setBackground(color);
     d->mergeFormatOnWordOrSelection(fmt);
     setFocus();
     d->activateRichText();
 }
 
 void KRichTextEdit::setFontFamily(const QString &fontFamily)
 {
     QTextCharFormat fmt;
     fmt.setFontFamily(fontFamily);
     d->mergeFormatOnWordOrSelection(fmt);
     setFocus();
     d->activateRichText();
 }
 
 void KRichTextEdit::setFontSize(int size)
 {
     QTextCharFormat fmt;
     fmt.setFontPointSize(size);
     d->mergeFormatOnWordOrSelection(fmt);
     setFocus();
     d->activateRichText();
 }
 
 void KRichTextEdit::setFont(const QFont &font)
 {
     QTextCharFormat fmt;
     fmt.setFont(font);
     d->mergeFormatOnWordOrSelection(fmt);
     setFocus();
     d->activateRichText();
 }
 
 void KRichTextEdit::switchToPlainText()
 {
     if (d->mMode == Rich) {
         d->mMode = Plain;
         // TODO: Warn the user about this?
         QMetaObject::invokeMethod(this, "insertPlainTextImplementation");
         setAcceptRichText(false);
         emit textModeChanged(d->mMode);
     }
 }
 
 void KRichTextEdit::insertPlainTextImplementation()
 {
     document()->setPlainText(document()->toPlainText());
 }
 
 void KRichTextEdit::setTextSuperScript(bool superscript)
 {
     QTextCharFormat fmt;
     fmt.setVerticalAlignment(superscript ? QTextCharFormat::AlignSuperScript : QTextCharFormat::AlignNormal);
     d->mergeFormatOnWordOrSelection(fmt);
     setFocus();
     d->activateRichText();
 }
 
 void KRichTextEdit::setTextSubScript(bool subscript)
 {
     QTextCharFormat fmt;
     fmt.setVerticalAlignment(subscript ? QTextCharFormat::AlignSubScript : QTextCharFormat::AlignNormal);
     d->mergeFormatOnWordOrSelection(fmt);
     setFocus();
     d->activateRichText();
 }
 
 void KRichTextEdit::enableRichTextMode()
 {
     d->activateRichText();
 }
 
 KRichTextEdit::Mode KRichTextEdit::textMode() const
 {
     return d->mMode;
 }
 
 QString KRichTextEdit::textOrHtml() const
 {
     if (textMode() == Rich) {
         return toCleanHtml();
     } else {
         return toPlainText();
     }
 }
 
 void KRichTextEdit::setTextOrHtml(const QString &text)
 {
     // might be rich text
     if (Qt::mightBeRichText(text)) {
         if (d->mMode == KRichTextEdit::Plain) {
             d->activateRichText();
         }
         setHtml(text);
     } else {
         setPlainText(text);
     }
 }
 
 QString KRichTextEdit::currentLinkText() const
 {
     QTextCursor cursor = textCursor();
     selectLinkText(&cursor);
     return cursor.selectedText();
 }
 
 void KRichTextEdit::selectLinkText() const
 {
     QTextCursor cursor = textCursor();
     selectLinkText(&cursor);
     d->setTextCursor(cursor);
 }
 
 void KRichTextEdit::selectLinkText(QTextCursor *cursor) const
 {
     // If the cursor is on a link, select the text of the link.
     if (cursor->charFormat().isAnchor()) {
         QString aHref = cursor->charFormat().anchorHref();
 
         // Move cursor to start of link
         while (cursor->charFormat().anchorHref() == aHref) {
             if (cursor->atStart()) {
                 break;
             }
             cursor->setPosition(cursor->position() - 1);
         }
         if (cursor->charFormat().anchorHref() != aHref) {
             cursor->setPosition(cursor->position() + 1, QTextCursor::KeepAnchor);
         }
 
         // Move selection to the end of the link
         while (cursor->charFormat().anchorHref() == aHref) {
             if (cursor->atEnd()) {
                 break;
             }
             cursor->setPosition(cursor->position() + 1, QTextCursor::KeepAnchor);
         }
         if (cursor->charFormat().anchorHref() != aHref) {
             cursor->setPosition(cursor->position() - 1, QTextCursor::KeepAnchor);
         }
     } else if (cursor->hasSelection()) {
         // Nothing to to. Using the currently selected text as the link text.
     } else {
 
         // Select current word
         cursor->movePosition(QTextCursor::StartOfWord);
         cursor->movePosition(QTextCursor::EndOfWord, QTextCursor::KeepAnchor);
     }
 }
 
 QString KRichTextEdit::currentLinkUrl() const
 {
     return textCursor().charFormat().anchorHref();
 }
 
 void KRichTextEdit::updateLink(const QString &linkUrl, const QString &linkText)
 {
     selectLinkText();
 
     QTextCursor cursor = textCursor();
     cursor.beginEditBlock();
 
     if (!cursor.hasSelection()) {
         cursor.select(QTextCursor::WordUnderCursor);
     }
 
     QTextCharFormat format = cursor.charFormat();
     // Save original format to create an extra space with the existing char
     // format for the block
     const QTextCharFormat originalFormat = format;
     if (!linkUrl.isEmpty()) {
         // Add link details
         format.setAnchor(true);
         format.setAnchorHref(linkUrl);
         // Workaround for QTBUG-1814:
         // Link formatting does not get applied immediately when setAnchor(true)
         // is called.  So the formatting needs to be applied manually.
         format.setUnderlineStyle(QTextCharFormat::SingleUnderline);
         format.setUnderlineColor(KColorScheme(QPalette::Active, KColorScheme::View).foreground(KColorScheme::LinkText).color());
         format.setForeground(KColorScheme(QPalette::Active, KColorScheme::View).foreground(KColorScheme::LinkText).color());
         d->activateRichText();
     } else {
         // Remove link details
         format.setAnchor(false);
         format.setAnchorHref(QString());
         // Workaround for QTBUG-1814:
         // Link formatting does not get removed immediately when setAnchor(false)
         // is called. So the formatting needs to be applied manually.
         QTextDocument defaultTextDocument;
         QTextCharFormat defaultCharFormat = defaultTextDocument.begin().charFormat();
 
         format.setUnderlineStyle(defaultCharFormat.underlineStyle());
         format.setUnderlineColor(defaultCharFormat.underlineColor());
         format.setForeground(defaultCharFormat.foreground());
     }
 
     // Insert link text specified in dialog, otherwise write out url.
     QString _linkText;
     if (!linkText.isEmpty()) {
         _linkText = linkText;
     } else {
         _linkText = linkUrl;
     }
     cursor.insertText(_linkText, format);
 
     // Insert a space after the link if at the end of the block so that
     // typing some text after the link does not carry link formatting
     if (!linkUrl.isEmpty() && cursor.atBlockEnd()) {
         cursor.setPosition(cursor.selectionEnd());
         cursor.setCharFormat(originalFormat);
         cursor.insertText(QStringLiteral(" "));
     }
 
     cursor.endEditBlock();
 }
 
 void KRichTextEdit::keyPressEvent(QKeyEvent *event)
 {
     bool handled = false;
+    textCursor().beginEditBlock();
     if (textCursor().currentList()) {
         // handled is False if the key press event was not handled or not completely
         // handled by the Helper class.
         handled = d->nestedListHelper->handleBeforeKeyPressEvent(event);
     }
 
     if (!handled) {
         KTextEdit::keyPressEvent(event);
     }
 
     if (textCursor().currentList()) {
         d->nestedListHelper->handleAfterKeyPressEvent(event);
     }
+    textCursor().endEditBlock();
     emit cursorPositionChanged();
 }
 
 // void KRichTextEdit::dropEvent(QDropEvent *event)
 // {
 //     int dropSize = event->mimeData()->text().size();
 //
 //     dropEvent( event );
 //     QTextCursor cursor = textCursor();
 //     int cursorPosition = cursor.position();
 //     cursor.setPosition( cursorPosition - dropSize );
 //     cursor.setPosition( cursorPosition, QTextCursor::KeepAnchor );
 //     setTextCursor( cursor );
 //     d->nestedListHelper->handleAfterDropEvent( event );
 // }
 
 bool KRichTextEdit::canIndentList() const
 {
     return d->nestedListHelper->canIndent();
 }
 
 bool KRichTextEdit::canDedentList() const
 {
     return d->nestedListHelper->canDedent();
 }
 
 QString KRichTextEdit::toCleanHtml() const
 {
     QString result = toHtml();
 
     static const QString EMPTYLINEHTML = QLatin1String(
             "<p style=\"-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; "
             "margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; \">&nbsp;</p>");
 
     // Qt inserts various style properties based on the current mode of the editor (underline,
     // bold, etc), but only empty paragraphs *also* have qt-paragraph-type set to 'empty'.
     static const QString EMPTYLINEREGEX = QStringLiteral(
             "<p style=\"-qt-paragraph-type:empty;(.*?)</p>");
 
     static const QString OLLISTPATTERNQT = QStringLiteral(
             "<ol style=\"margin-top: 0px; margin-bottom: 0px; margin-left: 0px;");
 
     static const QString ULLISTPATTERNQT = QStringLiteral(
             "<ul style=\"margin-top: 0px; margin-bottom: 0px; margin-left: 0px;");
 
     static const QString ORDEREDLISTHTML = QStringLiteral(
             "<ol style=\"margin-top: 0px; margin-bottom: 0px;");
 
     static const QString UNORDEREDLISTHTML = QStringLiteral(
                 "<ul style=\"margin-top: 0px; margin-bottom: 0px;");
 
     // fix 1 - empty lines should show as empty lines - MS Outlook treats margin-top:0px; as
     // a non-existing line.
     // Although we can simply remove the margin-top style property, we still get unwanted results
     // if you have three or more empty lines. It's best to replace empty <p> elements with <p>&nbsp;</p>.
     // replace all occurrences with the new line text
     result.replace(QRegularExpression(EMPTYLINEREGEX), EMPTYLINEHTML);
 
     // fix 2a - ordered lists - MS Outlook treats margin-left:0px; as
     // a non-existing number; e.g: "1. First item" turns into "First Item"
     result.replace(OLLISTPATTERNQT, ORDEREDLISTHTML);
 
     // fix 2b - unordered lists - MS Outlook treats margin-left:0px; as
     // a non-existing bullet; e.g: "* First bullet" turns into "First Bullet"
     result.replace(ULLISTPATTERNQT, UNORDEREDLISTHTML);
 
     return result;
 }