diff --git a/tine20/Felamimail/js/MessageEditDialog.js b/tine20/Felamimail/js/MessageEditDialog.js
index 8d68de6a0c..02fd44024e 100644
--- a/tine20/Felamimail/js/MessageEditDialog.js
+++ b/tine20/Felamimail/js/MessageEditDialog.js
@@ -535,6 +535,10 @@ Tine.Felamimail.MessageEditDialog = Ext.extend(Tine.widgets.dialog.EditDialog, {
             }
         }
 
+        if (this.isForwardedMessage()) {
+            this.msgBody = '<div class="felamimail-body-forwarded">' + this.msgBody + '</div>'
+        }
+
         this.msgBody = this.getQuotedMailHeader(format) + this.msgBody;
 
         if (this.isForwardedMessage()) {
diff --git a/tine20/Tinebase/js/util/contrastColors.js b/tine20/Tinebase/js/util/contrastColors.js
index 05392f82cd..faf552c733 100644
--- a/tine20/Tinebase/js/util/contrastColors.js
+++ b/tine20/Tinebase/js/util/contrastColors.js
@@ -13,7 +13,7 @@ const contrastColors = {
       if (c.classList.contains('felamimail-body-signature-current')) {
         return;
       }
-      if (c.classList.contains('felamimail-body-blockquote')) {
+      if (c.classList.contains('felamimail-body-blockquote') || c.classList.contains('felamimail-body-forwarded')) {
         // quoted email gets its own background
         contrastColors.findBackground(c)
       } else {
diff --git a/tine20/library/ExtJS/src/widgets/form/HtmlEditor.js b/tine20/library/ExtJS/src/widgets/form/HtmlEditor.js
index 78f540f93a..aad728d81d 100644
--- a/tine20/library/ExtJS/src/widgets/form/HtmlEditor.js
+++ b/tine20/library/ExtJS/src/widgets/form/HtmlEditor.js
@@ -4,6 +4,8 @@
  * licensing@extjs.com
  * http://www.extjs.com/license
  */
+import {contrastColors} from "../../../../../Tinebase/js/util/contrastColors";
+
 /**
  * @class Ext.form.HtmlEditor
  * @extends Ext.form.Field
@@ -667,6 +669,7 @@ Ext.form.HtmlEditor = Ext.extend(Ext.form.Field, {
     // private
     initEvents : function(){
         this.originalValue = this.getValue();
+        this.on('activate', this.onActivate);
     },
 
     /**
@@ -892,6 +895,14 @@ Ext.form.HtmlEditor = Ext.extend(Ext.form.Field, {
         this.fireEvent('activate', this);
     },
 
+    onActivate: function (e) {
+        _.forEach(this.getEditorBody().children, (c) => {
+            if (c.classList.contains('felamimail-body-blockquote') || c.classList.contains('felamimail-body-forwarded')) {
+                contrastColors.findBackground(c)
+            }
+        })
+    },
+
     // private
     adjustFont: function(btn){
         var adjust = btn.getItemId() == 'increasefontsize' ? 1 : -1,