diff --git a/src/plugins/diffeditor/diffeditor.cpp b/src/plugins/diffeditor/diffeditor.cpp
index 63fe415530f..0c76a2f3d73 100644
--- a/src/plugins/diffeditor/diffeditor.cpp
+++ b/src/plugins/diffeditor/diffeditor.cpp
@@ -41,6 +41,7 @@
 #include <texteditor/basetexteditor.h>
 #include <texteditor/texteditorsettings.h>
 #include <texteditor/displaysettings.h>
+#include <texteditor/marginsettings.h>
 
 #include <QStackedWidget>
 #include <QToolButton>
@@ -79,13 +80,13 @@ public:
 signals:
     void expandBranchesRequested();
 
-public slots:
-    void setDisplaySettings(const DisplaySettings &ds);
-
 protected:
     void mouseMoveEvent(QMouseEvent *e);
     void mouseReleaseEvent(QMouseEvent *e);
 
+    void setDisplaySettings(const DisplaySettings &ds);
+    void setMarginSettings(const MarginSettings &ms);
+
     bool findContentsUnderCursor(const QTextCursor &cursor);
     void highlightCurrentContents();
     void handleCurrentContents();
@@ -128,6 +129,12 @@ void DescriptionEditorWidget::setDisplaySettings(const DisplaySettings &ds)
     BaseTextEditorWidget::setDisplaySettings(settings);
 }
 
+void DescriptionEditorWidget::setMarginSettings(const MarginSettings &ms)
+{
+    Q_UNUSED(ms);
+    BaseTextEditorWidget::setMarginSettings(MarginSettings());
+}
+
 void DescriptionEditorWidget::mouseMoveEvent(QMouseEvent *e)
 {
     if (e->buttons()) {
@@ -227,17 +234,6 @@ DiffEditor::DiffEditor(const QSharedPointer<DiffEditorDocument> &doc)
 
     connect(m_descriptionWidget, SIGNAL(expandBranchesRequested()),
             m_document->controller(), SLOT(expandBranchesRequested()));
-    connect(TextEditorSettings::instance(), &TextEditorSettings::displaySettingsChanged,
-            m_descriptionWidget, &BaseTextEditorWidget::setDisplaySettings);
-    connect(TextEditorSettings::instance(), &TextEditorSettings::fontSettingsChanged,
-            m_descriptionWidget->textDocument(), &BaseTextDocument::setFontSettings);
-
-    m_descriptionWidget->setDisplaySettings(
-                TextEditorSettings::displaySettings());
-    m_descriptionWidget->setCodeStyle(
-                TextEditorSettings::codeStyle());
-    m_descriptionWidget->textDocument()->setFontSettings(
-                TextEditorSettings::fontSettings());
 
     m_controller = m_document->controller();
     m_guiController = new DiffEditorGuiController(m_controller, this);
diff --git a/src/plugins/texteditor/basetexteditor.h b/src/plugins/texteditor/basetexteditor.h
index cdd4cd284a6..f6357fc84a5 100644
--- a/src/plugins/texteditor/basetexteditor.h
+++ b/src/plugins/texteditor/basetexteditor.h
@@ -378,7 +378,7 @@ public:
     virtual void unCommentSelection();
 
     virtual void setDisplaySettings(const TextEditor::DisplaySettings &);
-    void setMarginSettings(const TextEditor::MarginSettings &);
+    virtual void setMarginSettings(const TextEditor::MarginSettings &);
     void setBehaviorSettings(const TextEditor::BehaviorSettings &);
     void setTypingSettings(const TextEditor::TypingSettings &);
     void setStorageSettings(const TextEditor::StorageSettings &);