diff --git a/src/main/java/org/olat/core/gui/components/form/flexible/FormUIFactory.java b/src/main/java/org/olat/core/gui/components/form/flexible/FormUIFactory.java
index 2aa7fc91e42a3b8c3c41c72a582165b6982e2568..2b16115c08ccc50ed47d9e7b22dba85333504975 100644
--- a/src/main/java/org/olat/core/gui/components/form/flexible/FormUIFactory.java
+++ b/src/main/java/org/olat/core/gui/components/form/flexible/FormUIFactory.java
@@ -854,14 +854,14 @@ public class FormUIFactory {
 		return rte;
 	}
 	
-	public RichTextElement addRichTextElementForQTI21Match(String name, String i18nLabel, String initialHTMLValue, int rows,
-			int cols, VFSContainer baseContainer, FormItemContainer formLayout, UserSession usess, WindowControl wControl) {
+	public RichTextElement addRichTextElementVeryMinimalistic(String name, String i18nLabel, String initialHTMLValue, int rows,
+			int cols, boolean withLinks,  VFSContainer baseContainer, FormItemContainer formLayout, UserSession usess, WindowControl wControl) {
 		// Create rich text element with bare bone configuration
 		RichTextElement rte = new RichTextElementImpl(name, initialHTMLValue, rows, cols, formLayout.getRootForm(), formLayout.getTranslator().getLocale());
 		setLabelIfNotNull(i18nLabel, rte);
 		// Now configure editor
 		Theme theme = wControl.getWindowBackOffice().getWindow().getGuiTheme();
-		rte.getEditorConfiguration().setConfigProfileFormVeryMinimalisticConfigEditor(usess, theme, baseContainer);
+		rte.getEditorConfiguration().setConfigProfileFormVeryMinimalisticConfigEditor(usess, theme, baseContainer, withLinks);
 		rte.getEditorConfiguration().setInvalidElements(RichTextConfiguration.INVALID_ELEMENTS_FORM_FULL_VALUE_UNSAVE_WITH_SCRIPT);
 		rte.getEditorConfiguration().setExtendedValidElements("script[src|type|defer]");
 		rte.getEditorConfiguration().disableTinyMedia();
diff --git a/src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/richText/RichTextConfiguration.java b/src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/richText/RichTextConfiguration.java
index d01ca545e986b896b0f9d3efa98d4c6763ab927d..1e0704d5b66563c74cf2210d810cb82042ffc1de 100644
--- a/src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/richText/RichTextConfiguration.java
+++ b/src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/richText/RichTextConfiguration.java
@@ -274,7 +274,7 @@ public class RichTextConfiguration implements Disposable {
 	 * @param guiTheme
 	 * @param baseContainer
 	 */
-	public void setConfigProfileFormVeryMinimalisticConfigEditor(UserSession usess, Theme guiTheme, VFSContainer baseContainer) {
+	public void setConfigProfileFormVeryMinimalisticConfigEditor(UserSession usess, Theme guiTheme, VFSContainer baseContainer, boolean withLinks) {
 		setConfigBasics(guiTheme);
 		// Add additional plugins
 		TinyMCECustomPluginFactory customPluginFactory = CoreSpringFactory.getImpl(TinyMCECustomPluginFactory.class);
@@ -285,7 +285,11 @@ public class RichTextConfiguration implements Disposable {
 		
 		// Don't allow javascript or iframes, if the file browser is there allow also media elements (the full values)
 		setQuotedConfigValue(INVALID_ELEMENTS, (baseContainer == null ? INVALID_ELEMENTS_FORM_SIMPLE_VALUE_UNSAVE : INVALID_ELEMENTS_FORM_FULL_VALUE_UNSAVE));
-		tinyConfig = TinyConfig.veryMinimalisticConfig;
+		if(withLinks) {
+			tinyConfig = TinyConfig.veryMinimalisticWithLinksConfig;
+		} else {
+			tinyConfig = TinyConfig.veryMinimalisticConfig;
+		}
 		setPathInStatusBar(false);
 		
 		// Setup file and link browser
diff --git a/src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/richText/TinyConfig.java b/src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/richText/TinyConfig.java
index 0b13271d5a86d69ba7e6c3c0800192755f558afd..b0937013b11c9298f80083a528b1a7adb3fceb13 100644
--- a/src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/richText/TinyConfig.java
+++ b/src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/richText/TinyConfig.java
@@ -32,6 +32,7 @@ public class TinyConfig {
 	protected static final TinyConfig editorCompactConfig;
 	protected static final TinyConfig fileEditorConfig;
 	protected static final TinyConfig minimalisticConfig;
+	protected static final TinyConfig veryMinimalisticWithLinksConfig;
 	protected static final TinyConfig veryMinimalisticConfig;
 	protected static final TinyConfig paragraphEditorConfig;
 
@@ -72,6 +73,12 @@ public class TinyConfig {
 		String tools1 = "bold italic underline | image olatmatheditor";
 		veryMinimalisticConfig = new TinyConfig(plugins, null, tools1);
 	}
+	static {
+		String plugins = "contextmenu,colorpicker,textcolor,hr,charmap,image,insertdatetime,table,visualchars,visualblocks,noneditable,olatsmileys,paste,link,quotespliter,olatmatheditor,olatmovieviewer,tabfocus,visualchars,visualblocks,noneditable,media";
+		String tools1 = "bold italic underline | image olatmatheditor | link unlink";
+		veryMinimalisticWithLinksConfig = new TinyConfig(plugins, null, tools1);
+	}
+	
 	//paragraph editor for content editor
 	static {
 		String plugins = "lists,contextmenu,textcolor,hr,noneditable,paste,link,olatmatheditor,tabfocus,noneditable";
diff --git a/src/main/java/org/olat/ims/qti21/ui/editor/interactions/MatchEditorController.java b/src/main/java/org/olat/ims/qti21/ui/editor/interactions/MatchEditorController.java
index 5c0f56bb12ac83d7477e72cece430ef4c78ad5b4..a1425dda370a3deb3cf457765765bbaab6a0b660 100644
--- a/src/main/java/org/olat/ims/qti21/ui/editor/interactions/MatchEditorController.java
+++ b/src/main/java/org/olat/ims/qti21/ui/editor/interactions/MatchEditorController.java
@@ -233,7 +233,7 @@ public class MatchEditorController extends FormBasicController {
 		List<FlowStatic> choiceFlow = choice.getFlowStatics();
 		String choiceContent =  itemBuilder.getHtmlHelper().flowStaticString(choiceFlow);
 		String choiceId = "answer" + count++;
-		RichTextElement choiceEl = uifactory.addRichTextElementForQTI21Match(choiceId, "form.imd.answer", choiceContent, 4, -1, itemContainer,
+		RichTextElement choiceEl = uifactory.addRichTextElementVeryMinimalistic(choiceId, "form.imd.answer", choiceContent, 4, -1, false, itemContainer,
 				answersCont, ureq.getUserSession(), getWindowControl());
 		choiceEl.setUserObject(choice);
 		choiceEl.setEnabled(!readOnly);
diff --git a/src/main/java/org/olat/ims/qti21/ui/editor/interactions/TrueFalseEditorController.java b/src/main/java/org/olat/ims/qti21/ui/editor/interactions/TrueFalseEditorController.java
index 3c414afd1cfe28b6f50fdcbcc046678c39de9088..a42d65b1966696f2ee6e3c99dcc307e9a1ddbb71 100644
--- a/src/main/java/org/olat/ims/qti21/ui/editor/interactions/TrueFalseEditorController.java
+++ b/src/main/java/org/olat/ims/qti21/ui/editor/interactions/TrueFalseEditorController.java
@@ -175,7 +175,7 @@ public class TrueFalseEditorController extends FormBasicController {
 		List<FlowStatic> choiceFlow = choice.getFlowStatics();
 		String choiceContent =  itemBuilder.getHtmlHelper().flowStaticString(choiceFlow);
 		String choiceId = "answer" + count++;
-		RichTextElement choiceEl = uifactory.addRichTextElementForQTI21Match(choiceId, "form.imd.answer", choiceContent, 4, -1, itemContainer,
+		RichTextElement choiceEl = uifactory.addRichTextElementVeryMinimalistic(choiceId, "form.imd.answer", choiceContent, 4, -1, false, itemContainer,
 				answersCont, ureq.getUserSession(), getWindowControl());
 		choiceEl.setUserObject(choice);
 		choiceEl.setEnabled(!readOnly);
diff --git a/src/main/java/org/olat/modules/video/ui/marker/MarkerEditController.java b/src/main/java/org/olat/modules/video/ui/marker/MarkerEditController.java
index 307315fa238c457f7582fafc18af52cd4a02ceb1..f3a7a42ef1ed62fc5a9e93207457ca58b0cd1e45 100644
--- a/src/main/java/org/olat/modules/video/ui/marker/MarkerEditController.java
+++ b/src/main/java/org/olat/modules/video/ui/marker/MarkerEditController.java
@@ -118,7 +118,7 @@ public class MarkerEditController extends FormBasicController {
 
 	@Override
 	protected void initForm(FormItemContainer formLayout, Controller listener, UserRequest ureq) {
-		markerTextEl = uifactory.addRichTextElementForQTI21Match("text", "video.marker.text", "", 4, -1, null,
+		markerTextEl = uifactory.addRichTextElementVeryMinimalistic("text", "video.marker.text", "", 4, -1, true, null,
 				formLayout, ureq.getUserSession(), getWindowControl());
 		markerTextEl.getEditorConfiguration().disableImageAndMovie();
 		markerTextEl.getEditorConfiguration().setSimplestTextModeAllowed(TextMode.oneLine);