diff --git a/src/main/java/org/olat/modules/fo/ui/MessageEditController.java b/src/main/java/org/olat/modules/fo/ui/MessageEditController.java
index 63643a782d0a09e3be4a243efafae613c2932478..c2714266c793a80d0994f34f76cbb86c95e0aaae 100644
--- a/src/main/java/org/olat/modules/fo/ui/MessageEditController.java
+++ b/src/main/java/org/olat/modules/fo/ui/MessageEditController.java
@@ -497,6 +497,7 @@ public class MessageEditController extends FormBasicController {
 		String body = bodyEl.getValue();
 		body = body.replace("<p>&nbsp;", "<p>");
 		String editorMapperUri = Settings.createServerURI() + bodyEl.getEditorConfiguration().getMapperURI();
+		body = body.replace(editorMapperUri + "media/", "media/");
 		body = body.replace(editorMapperUri, "media/");
 		message.setBody(body.trim());
 	}