diff --git a/src/components/SignatureSettings.vue b/src/components/SignatureSettings.vue
index 37ea36e799..d76a60be3f 100644
--- a/src/components/SignatureSettings.vue
+++ b/src/components/SignatureSettings.vue
@@ -271,9 +271,9 @@ export default {
 .warning-large-signature {
 	color: darkorange;
 }
-
+// its a bit hard to make it work without this max-width in the modal because it overlaps with the sidebar of the modal
 :deep(.ck.ck-toolbar-dropdown>.ck-dropdown__panel) {
-	max-width: 34vw;
+	max-width: 19vw;
 }
 
 </style>
diff --git a/src/components/TextEditor.vue b/src/components/TextEditor.vue
index d30f4cc7cc..1a8288985f 100644
--- a/src/components/TextEditor.vue
+++ b/src/components/TextEditor.vue
@@ -30,7 +30,7 @@ import {
 	Base64UploadAdapter,
 	BlockQuote,
 	Bold,
-	DecoupledEditor,
+	ClassicEditor,
 	DropdownView,
 	Essentials,
 	FindAndReplace,
@@ -46,6 +46,7 @@ import {
 	Mention,
 	Paragraph,
 	RemoveFormat,
+	SourceEditing,
 	Strikethrough,
 	Subscript,
 	Superscript,
@@ -127,7 +128,7 @@ export default {
 			FindAndReplace,
 			GeneralHtmlSupport,
 		]
-		const toolbar = ['undo', 'redo']
+		const toolbar = ['sourceEditing', 'undo', 'redo']
 
 		if (this.html) {
 			plugins.push(...[
@@ -148,6 +149,7 @@ export default {
 				RemoveFormat,
 				Base64UploadAdapter,
 				MailPlugin,
+				SourceEditing,
 			])
 			toolbar.unshift(...[
 				'heading',
@@ -177,7 +179,7 @@ export default {
 			emojiTribute: null,
 			textSmiles: [],
 			ready: false,
-			editor: DecoupledEditor,
+			editor: ClassicEditor,
 			config: {
 				licenseKey: 'GPL',
 				placeholder: this.placeholder,
@@ -208,6 +210,27 @@ export default {
 						},
 					],
 				},
+				htmlSupport: {
+					allow: [
+						'table',
+						'tbody',
+						'td',
+						'tfoot',
+						'th',
+						'thead',
+						'tr',
+						{
+							name: 'a',
+							attributes: true,
+							classes: true,
+							styles: true
+						},
+						{
+							name: 'img',
+							styles: true,
+						}
+					],
+				},
 			},
 		}
 	},