diff --git a/cypress/component/richtext.cy.ts b/cypress/component/richtext.cy.ts
index 519068d7b9..28ae7e6f77 100644
--- a/cypress/component/richtext.cy.ts
+++ b/cypress/component/richtext.cy.ts
@@ -6,6 +6,19 @@ import NcRichText from '../../src/components/NcRichText/NcRichText.vue'
 
 describe('NcRichText', () => {
 	describe('renders with markdown', () => {
+		describe('normal text', () => {
+			it('XML-like text (escaped and unescaped)', () => {
+				mount(NcRichText, {
+					propsData: {
+						text: '<span>text&lt;/span&gt;',
+						useMarkdown: true,
+					},
+				})
+
+				cy.get('p').should('have.text', '<span>text</span>')
+			})
+		})
+
 		describe('headings', () => {
 			it('heading (with hash (#) syntax divided with space from text)', () => {
 				const testCases = [
@@ -274,6 +287,17 @@ describe('NcRichText', () => {
 
 				cy.get('code').should('have.text', 'inline code')
 			})
+
+			it('inline code (with ignored bold, italic, XML-like syntax))', () => {
+				mount(NcRichText, {
+					propsData: {
+						text: '`inline code **bold text** _italic text_ <span>text&lt;/span&gt;`',
+						useMarkdown: true,
+					},
+				})
+
+				cy.get('code').should('have.text', 'inline code **bold text** _italic text_ <span>text</span>')
+			})
 		})
 
 		describe('multiline code', () => {
@@ -333,20 +357,20 @@ describe('NcRichText', () => {
 				cy.get('code').should('have.text', 'line 1\nline 2\nline 3\n')
 			})
 
-			it('multiline code (with ignored bold, italic, inline code syntax)', () => {
+			it('multiline code (with ignored bold, italic, inline code, XML-like syntax)', () => {
 				mount(NcRichText, {
 					propsData: {
-						text: '```\n**bold text**\n_italic text_\n`inline code`\n```',
+						text: '```\n**bold text**\n_italic text_\n`inline code`\n<span>text&lt;/span&gt;\n```',
 						useMarkdown: true,
 					},
 				})
 
-				cy.get('pre').should('have.text', '**bold text**\n_italic text_\n`inline code`\n')
+				cy.get('pre').should('have.text', '**bold text**\n_italic text_\n`inline code`\n<span>text</span>\n')
 			})
 		})
 
 		describe('blockquote', () => {
-			it('blockquote (with greater then (gt >) syntax)', () => {
+			it('blockquote (with greater then (>) syntax - normal)', () => {
 				mount(NcRichText, {
 					propsData: {
 						text: '> blockquote',
@@ -357,6 +381,17 @@ describe('NcRichText', () => {
 				cy.get('blockquote').should('have.text', '\nblockquote\n')
 			})
 
+			it('blockquote (with greater then (&gt;) syntax - escaped)', () => {
+				mount(NcRichText, {
+					propsData: {
+						text: '&gt; blockquote',
+						useMarkdown: true,
+					},
+				})
+
+				cy.get('blockquote').should('have.text', '\nblockquote\n')
+			})
+
 			it('blockquote (with bold, italic text, inline code)', () => {
 				mount(NcRichText, {
 					propsData: {
@@ -401,7 +436,7 @@ describe('NcRichText', () => {
 					},
 				})
 
-				cy.get('blockquote').should('have.text', '\nline 1\n\nline 3\n')
+				cy.get('blockquote').should('have.text', '\nline 1\nline 3\n')
 			})
 
 			it('blockquote (with nested blockquote)', () => {
diff --git a/l10n/messages.pot b/l10n/messages.pot
index 47ffa24798..53bc1f1b16 100644
--- a/l10n/messages.pot
+++ b/l10n/messages.pot
@@ -242,5 +242,5 @@ msgstr ""
 msgid "Undo changes"
 msgstr ""
 
-msgid "Write message, use \"@\" to mention someone, use \":\" for emoji autocompletion …"
+msgid "Write a message …"
 msgstr ""
diff --git a/package-lock.json b/package-lock.json
index a88156dca9..66753fe08f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -34,9 +34,9 @@
 				"linkify-string": "^4.0.0",
 				"md5": "^2.3.0",
 				"node-polyfill-webpack-plugin": "^2.0.1",
+				"rehype-external-links": "^3.0.0",
 				"rehype-react": "^7.1.2",
 				"remark-breaks": "^3.0.2",
-				"remark-external-links": "^9.0.1",
 				"remark-parse": "^10.0.1",
 				"remark-rehype": "^10.1.0",
 				"splitpanes": "^2.4.1",
@@ -4403,6 +4403,11 @@
 				"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
 			}
 		},
+		"node_modules/@ungap/structured-clone": {
+			"version": "1.2.0",
+			"resolved": "https://registry.npmjs.org/@ungap/structured-clone/-/structured-clone-1.2.0.tgz",
+			"integrity": "sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ=="
+		},
 		"node_modules/@vue/compiler-core": {
 			"version": "3.2.47",
 			"resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.2.47.tgz",
@@ -12413,6 +12418,26 @@
 				"url": "https://opencollective.com/unified"
 			}
 		},
+		"node_modules/hast-util-is-element": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/hast-util-is-element/-/hast-util-is-element-3.0.0.tgz",
+			"integrity": "sha512-Val9mnv2IWpLbNPqc/pUem+a7Ipj2aHacCwgNfTiK0vJKl0LF+4Ba4+v1oPHFpf3bLYmreq0/l3Gud9S5OH42g==",
+			"dependencies": {
+				"@types/hast": "^3.0.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/unified"
+			}
+		},
+		"node_modules/hast-util-is-element/node_modules/@types/hast": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/@types/hast/-/hast-3.0.0.tgz",
+			"integrity": "sha512-SoytUJRuf68HXYqcXicQIhCrLQjqeYU2anikr4G3p3Iz+OZO5QDQpDj++gv+RenHsnUBwNZ2dumBArF8VLSk2Q==",
+			"dependencies": {
+				"@types/unist": "*"
+			}
+		},
 		"node_modules/hast-util-whitespace": {
 			"version": "2.0.1",
 			"resolved": "https://registry.npmjs.org/hast-util-whitespace/-/hast-util-whitespace-2.0.1.tgz",
@@ -20455,6 +20480,86 @@
 				"jsesc": "bin/jsesc"
 			}
 		},
+		"node_modules/rehype-external-links": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/rehype-external-links/-/rehype-external-links-3.0.0.tgz",
+			"integrity": "sha512-yp+e5N9V3C6bwBeAC4n796kc86M4gJCdlVhiMTxIrJG5UHDMh+PJANf9heqORJbt1nrCbDwIlAZKjANIaVBbvw==",
+			"dependencies": {
+				"@types/hast": "^3.0.0",
+				"@ungap/structured-clone": "^1.0.0",
+				"hast-util-is-element": "^3.0.0",
+				"is-absolute-url": "^4.0.0",
+				"space-separated-tokens": "^2.0.0",
+				"unist-util-visit": "^5.0.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/unified"
+			}
+		},
+		"node_modules/rehype-external-links/node_modules/@types/hast": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/@types/hast/-/hast-3.0.0.tgz",
+			"integrity": "sha512-SoytUJRuf68HXYqcXicQIhCrLQjqeYU2anikr4G3p3Iz+OZO5QDQpDj++gv+RenHsnUBwNZ2dumBArF8VLSk2Q==",
+			"dependencies": {
+				"@types/unist": "*"
+			}
+		},
+		"node_modules/rehype-external-links/node_modules/@types/unist": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/@types/unist/-/unist-3.0.0.tgz",
+			"integrity": "sha512-MFETx3tbTjE7Uk6vvnWINA/1iJ7LuMdO4fcq8UfF0pRbj01aGLduVvQcRyswuACJdpnHgg8E3rQLhaRdNEJS0w=="
+		},
+		"node_modules/rehype-external-links/node_modules/is-absolute-url": {
+			"version": "4.0.1",
+			"resolved": "https://registry.npmjs.org/is-absolute-url/-/is-absolute-url-4.0.1.tgz",
+			"integrity": "sha512-/51/TKE88Lmm7Gc4/8btclNXWS+g50wXhYJq8HWIBAGUBnoAdRu1aXeh364t/O7wXDAcTJDP8PNuNKWUDWie+A==",
+			"engines": {
+				"node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/rehype-external-links/node_modules/unist-util-is": {
+			"version": "6.0.0",
+			"resolved": "https://registry.npmjs.org/unist-util-is/-/unist-util-is-6.0.0.tgz",
+			"integrity": "sha512-2qCTHimwdxLfz+YzdGfkqNlH0tLi9xjTnHddPmJwtIG9MGsdbutfTc4P+haPD7l7Cjxf/WZj+we5qfVPvvxfYw==",
+			"dependencies": {
+				"@types/unist": "^3.0.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/unified"
+			}
+		},
+		"node_modules/rehype-external-links/node_modules/unist-util-visit": {
+			"version": "5.0.0",
+			"resolved": "https://registry.npmjs.org/unist-util-visit/-/unist-util-visit-5.0.0.tgz",
+			"integrity": "sha512-MR04uvD+07cwl/yhVuVWAtw+3GOR/knlL55Nd/wAdblk27GCVt3lqpTivy/tkJcZoNPzTwS1Y+KMojlLDhoTzg==",
+			"dependencies": {
+				"@types/unist": "^3.0.0",
+				"unist-util-is": "^6.0.0",
+				"unist-util-visit-parents": "^6.0.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/unified"
+			}
+		},
+		"node_modules/rehype-external-links/node_modules/unist-util-visit-parents": {
+			"version": "6.0.1",
+			"resolved": "https://registry.npmjs.org/unist-util-visit-parents/-/unist-util-visit-parents-6.0.1.tgz",
+			"integrity": "sha512-L/PqWzfTP9lzzEa6CKs0k2nARxTdZduw3zyh8d2NVBnsyvHjSX4TWse388YrrQKbvI8w20fGjGlhgT96WwKykw==",
+			"dependencies": {
+				"@types/unist": "^3.0.0",
+				"unist-util-is": "^6.0.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/unified"
+			}
+		},
 		"node_modules/rehype-react": {
 			"version": "7.2.0",
 			"resolved": "https://registry.npmjs.org/rehype-react/-/rehype-react-7.2.0.tgz",
@@ -20503,36 +20608,6 @@
 				"url": "https://opencollective.com/unified"
 			}
 		},
-		"node_modules/remark-external-links": {
-			"version": "9.0.1",
-			"resolved": "https://registry.npmjs.org/remark-external-links/-/remark-external-links-9.0.1.tgz",
-			"integrity": "sha512-EYw+p8Zqy5oT5+W8iSKzInfRLY+zeKWHCf0ut+Q5SwnaSIDGXd2zzvp4SWqyAuVbinNmZ0zjMrDKaExWZnTYqQ==",
-			"dependencies": {
-				"@types/hast": "^2.3.2",
-				"@types/mdast": "^3.0.0",
-				"extend": "^3.0.0",
-				"is-absolute-url": "^4.0.0",
-				"mdast-util-definitions": "^5.0.0",
-				"space-separated-tokens": "^2.0.0",
-				"unified": "^10.0.0",
-				"unist-util-visit": "^4.0.0"
-			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/unified"
-			}
-		},
-		"node_modules/remark-external-links/node_modules/is-absolute-url": {
-			"version": "4.0.1",
-			"resolved": "https://registry.npmjs.org/is-absolute-url/-/is-absolute-url-4.0.1.tgz",
-			"integrity": "sha512-/51/TKE88Lmm7Gc4/8btclNXWS+g50wXhYJq8HWIBAGUBnoAdRu1aXeh364t/O7wXDAcTJDP8PNuNKWUDWie+A==",
-			"engines": {
-				"node": "^12.20.0 || ^14.13.1 || >=16.0.0"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
-			}
-		},
 		"node_modules/remark-parse": {
 			"version": "10.0.2",
 			"resolved": "https://registry.npmjs.org/remark-parse/-/remark-parse-10.0.2.tgz",
@@ -30804,6 +30879,11 @@
 				}
 			}
 		},
+		"@ungap/structured-clone": {
+			"version": "1.2.0",
+			"resolved": "https://registry.npmjs.org/@ungap/structured-clone/-/structured-clone-1.2.0.tgz",
+			"integrity": "sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ=="
+		},
 		"@vue/compiler-core": {
 			"version": "3.2.47",
 			"resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.2.47.tgz",
@@ -36986,6 +37066,24 @@
 				"web-namespaces": "^2.0.0"
 			}
 		},
+		"hast-util-is-element": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/hast-util-is-element/-/hast-util-is-element-3.0.0.tgz",
+			"integrity": "sha512-Val9mnv2IWpLbNPqc/pUem+a7Ipj2aHacCwgNfTiK0vJKl0LF+4Ba4+v1oPHFpf3bLYmreq0/l3Gud9S5OH42g==",
+			"requires": {
+				"@types/hast": "^3.0.0"
+			},
+			"dependencies": {
+				"@types/hast": {
+					"version": "3.0.0",
+					"resolved": "https://registry.npmjs.org/@types/hast/-/hast-3.0.0.tgz",
+					"integrity": "sha512-SoytUJRuf68HXYqcXicQIhCrLQjqeYU2anikr4G3p3Iz+OZO5QDQpDj++gv+RenHsnUBwNZ2dumBArF8VLSk2Q==",
+					"requires": {
+						"@types/unist": "*"
+					}
+				}
+			}
+		},
 		"hast-util-whitespace": {
 			"version": "2.0.1",
 			"resolved": "https://registry.npmjs.org/hast-util-whitespace/-/hast-util-whitespace-2.0.1.tgz",
@@ -43023,6 +43121,66 @@
 				}
 			}
 		},
+		"rehype-external-links": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/rehype-external-links/-/rehype-external-links-3.0.0.tgz",
+			"integrity": "sha512-yp+e5N9V3C6bwBeAC4n796kc86M4gJCdlVhiMTxIrJG5UHDMh+PJANf9heqORJbt1nrCbDwIlAZKjANIaVBbvw==",
+			"requires": {
+				"@types/hast": "^3.0.0",
+				"@ungap/structured-clone": "^1.0.0",
+				"hast-util-is-element": "^3.0.0",
+				"is-absolute-url": "^4.0.0",
+				"space-separated-tokens": "^2.0.0",
+				"unist-util-visit": "^5.0.0"
+			},
+			"dependencies": {
+				"@types/hast": {
+					"version": "3.0.0",
+					"resolved": "https://registry.npmjs.org/@types/hast/-/hast-3.0.0.tgz",
+					"integrity": "sha512-SoytUJRuf68HXYqcXicQIhCrLQjqeYU2anikr4G3p3Iz+OZO5QDQpDj++gv+RenHsnUBwNZ2dumBArF8VLSk2Q==",
+					"requires": {
+						"@types/unist": "*"
+					}
+				},
+				"@types/unist": {
+					"version": "3.0.0",
+					"resolved": "https://registry.npmjs.org/@types/unist/-/unist-3.0.0.tgz",
+					"integrity": "sha512-MFETx3tbTjE7Uk6vvnWINA/1iJ7LuMdO4fcq8UfF0pRbj01aGLduVvQcRyswuACJdpnHgg8E3rQLhaRdNEJS0w=="
+				},
+				"is-absolute-url": {
+					"version": "4.0.1",
+					"resolved": "https://registry.npmjs.org/is-absolute-url/-/is-absolute-url-4.0.1.tgz",
+					"integrity": "sha512-/51/TKE88Lmm7Gc4/8btclNXWS+g50wXhYJq8HWIBAGUBnoAdRu1aXeh364t/O7wXDAcTJDP8PNuNKWUDWie+A=="
+				},
+				"unist-util-is": {
+					"version": "6.0.0",
+					"resolved": "https://registry.npmjs.org/unist-util-is/-/unist-util-is-6.0.0.tgz",
+					"integrity": "sha512-2qCTHimwdxLfz+YzdGfkqNlH0tLi9xjTnHddPmJwtIG9MGsdbutfTc4P+haPD7l7Cjxf/WZj+we5qfVPvvxfYw==",
+					"requires": {
+						"@types/unist": "^3.0.0"
+					}
+				},
+				"unist-util-visit": {
+					"version": "5.0.0",
+					"resolved": "https://registry.npmjs.org/unist-util-visit/-/unist-util-visit-5.0.0.tgz",
+					"integrity": "sha512-MR04uvD+07cwl/yhVuVWAtw+3GOR/knlL55Nd/wAdblk27GCVt3lqpTivy/tkJcZoNPzTwS1Y+KMojlLDhoTzg==",
+					"requires": {
+						"@types/unist": "^3.0.0",
+						"unist-util-is": "^6.0.0",
+						"unist-util-visit-parents": "^6.0.0"
+					}
+				},
+				"unist-util-visit-parents": {
+					"version": "6.0.1",
+					"resolved": "https://registry.npmjs.org/unist-util-visit-parents/-/unist-util-visit-parents-6.0.1.tgz",
+					"integrity": "sha512-L/PqWzfTP9lzzEa6CKs0k2nARxTdZduw3zyh8d2NVBnsyvHjSX4TWse388YrrQKbvI8w20fGjGlhgT96WwKykw==",
+					"requires": {
+						"@types/unist": "^3.0.0",
+						"unist-util-is": "^6.0.0"
+					}
+				}
+			}
+		},
 		"rehype-react": {
 			"version": "7.2.0",
 			"resolved": "https://registry.npmjs.org/rehype-react/-/rehype-react-7.2.0.tgz",
@@ -43159,28 +43317,6 @@
 				"unist-util-visit": "^4.0.0"
 			}
 		},
-		"remark-external-links": {
-			"version": "9.0.1",
-			"resolved": "https://registry.npmjs.org/remark-external-links/-/remark-external-links-9.0.1.tgz",
-			"integrity": "sha512-EYw+p8Zqy5oT5+W8iSKzInfRLY+zeKWHCf0ut+Q5SwnaSIDGXd2zzvp4SWqyAuVbinNmZ0zjMrDKaExWZnTYqQ==",
-			"requires": {
-				"@types/hast": "^2.3.2",
-				"@types/mdast": "^3.0.0",
-				"extend": "^3.0.0",
-				"is-absolute-url": "^4.0.0",
-				"mdast-util-definitions": "^5.0.0",
-				"space-separated-tokens": "^2.0.0",
-				"unified": "^10.0.0",
-				"unist-util-visit": "^4.0.0"
-			},
-			"dependencies": {
-				"is-absolute-url": {
-					"version": "4.0.1",
-					"resolved": "https://registry.npmjs.org/is-absolute-url/-/is-absolute-url-4.0.1.tgz",
-					"integrity": "sha512-/51/TKE88Lmm7Gc4/8btclNXWS+g50wXhYJq8HWIBAGUBnoAdRu1aXeh364t/O7wXDAcTJDP8PNuNKWUDWie+A=="
-				}
-			}
-		},
 		"remark-parse": {
 			"version": "10.0.2",
 			"resolved": "https://registry.npmjs.org/remark-parse/-/remark-parse-10.0.2.tgz",
diff --git a/package.json b/package.json
index ab997ae24e..a43ffbb552 100644
--- a/package.json
+++ b/package.json
@@ -65,9 +65,9 @@
 		"linkify-string": "^4.0.0",
 		"md5": "^2.3.0",
 		"node-polyfill-webpack-plugin": "^2.0.1",
+		"rehype-external-links": "^3.0.0",
 		"rehype-react": "^7.1.2",
 		"remark-breaks": "^3.0.2",
-		"remark-external-links": "^9.0.1",
 		"remark-parse": "^10.0.1",
 		"remark-rehype": "^10.1.0",
 		"splitpanes": "^2.4.1",
diff --git a/src/components/NcAvatar/NcAvatar.vue b/src/components/NcAvatar/NcAvatar.vue
index 69a844131b..83600cc531 100644
--- a/src/components/NcAvatar/NcAvatar.vue
+++ b/src/components/NcAvatar/NcAvatar.vue
@@ -700,6 +700,7 @@ export default {
 	&--unknown {
 		position: relative;
 		background-color: var(--color-main-background);
+		white-space: normal;
 	}
 
 	&:not(&--unknown) {
diff --git a/src/components/NcRichContenteditable/NcRichContenteditable.vue b/src/components/NcRichContenteditable/NcRichContenteditable.vue
index d14577edd8..ad16c096af 100644
--- a/src/components/NcRichContenteditable/NcRichContenteditable.vue
+++ b/src/components/NcRichContenteditable/NcRichContenteditable.vue
@@ -27,6 +27,8 @@ This component displays contenteditable div with automated `@` [at] autocompleti
 
 ### Examples
 
+Try mentioning user @Test01 or inserting emoji :smile
+
 ```vue
 <template>
 	<div>
@@ -35,7 +37,6 @@ This component displays contenteditable div with automated `@` [at] autocompleti
 			:auto-complete="autoComplete"
 			:maxlength="100"
 			:user-data="userData"
-			placeholder="Try mentioning user @Test01 or inserting emoji :smile"
 			@submit="onSubmit" />
 		<br>
 
@@ -45,7 +46,6 @@ This component displays contenteditable div with automated `@` [at] autocompleti
 			:maxlength="400"
 			:multiline="true"
 			:user-data="userData"
-			placeholder="Try mentioning user @Test01 or inserting emoji :smile"
 			@submit="onSubmit" />
 
 		<h5>Output - raw</h5>
@@ -55,21 +55,16 @@ This component displays contenteditable div with automated `@` [at] autocompleti
 		<p class="pre-line">{{ message }}</p>
 
 		<h5>Output - in NcRichText with markdown support</h5>
-		<NcRichText :text="message" use-markdown />
+		<NcRichText :text="text" :arguments="userMentions" autolink use-markdown />
 	</div>
 </template>
 <script>
-	import NcRichText from "../NcRichText/NcRichText.vue";
-
 export default {
-	components: {NcRichText},
-
 	data() {
 		return {
 			message: '**Lorem ipsum** dolor sit amet.',
-
-			// You need to provide this for the inline
-			// mention to understand what to display or not.
+			// You need to provide this for the inline mention to understand what to display or not.
+			// Key should be a string with leading '@', like @Test02 or @"Test Offline"
 			userData: {
 				Test01: {
 					icon: 'icon-user',
@@ -91,9 +86,9 @@ export default {
 					},
 					subline: 'Visiting London',
 				},
-				'Test 03': {
+				'Test@User': {
 					icon: 'icon-user',
-					id: 'Test 03',
+					id: 'Test@User',
 					label: 'Test 03',
 					source: 'users',
 					status: {
@@ -130,9 +125,59 @@ export default {
 					},
 					subline: 'Out sick',
 				},
+			},
+			// To display user bubbles in NcRichText, special format of data should be provided:
+			// Key should be in curly brackets without '@' and ' ' symbols, like {user-2}
+			userMentions: {
+				'user-1': {
+					component: 'NcUserBubble',
+					props: {
+						displayName: 'Test01',
+						user: 'Test01',
+						primary: true,
+					},
+				},
+				'user-2': {
+					component: 'NcUserBubble',
+					props: {
+						displayName: 'Test02',
+						user: 'Test02',
+					},
+				},
+				'user-3': {
+					component: 'NcUserBubble',
+					props: {
+						displayName: 'Test 03',
+						user: 'Test@User',
+					},
+				},
+				'user-4': {
+					component: 'NcUserBubble',
+					props: {
+						displayName: 'Test Offline',
+						user: 'Test Offline',
+					},
+				},
+				'user-5': {
+					component: 'NcUserBubble',
+					props: {
+						displayName: 'Test DND',
+						user: 'Test DND',
+					},
+				},
 			}
 		}
 	},
+	computed: {
+		text() {
+			return this.message
+					.replace('@Test01', '{user-1}')
+					.replace('@Test02', '{user-2}')
+					.replace('@Test@User', '{user-3}')
+					.replace('@"Test Offline"', '{user-4}')
+					.replace('@"Test DND"', '{user-5}')
+		},
+	},
 	methods: {
 		/**
 		* Do your own query to the autocompletion api.
@@ -177,6 +222,7 @@ export default {
 		}"
 		:contenteditable="canEdit"
 		:placeholder="placeholder"
+		:aria-placeholder="placeholder"
 		aria-multiline="true"
 		class="rich-contenteditable__input"
 		role="textbox"
@@ -221,7 +267,7 @@ export default {
 
 		placeholder: {
 			type: String,
-			default: t('Write message, use "@" to mention someone, use ":" for emoji autocompletion …'),
+			default: t('Write a message …'),
 		},
 
 		autoComplete: {
diff --git a/src/components/NcRichText/NcRichText.vue b/src/components/NcRichText/NcRichText.vue
index 90a9344f14..a183742ff0 100644
--- a/src/components/NcRichText/NcRichText.vue
+++ b/src/components/NcRichText/NcRichText.vue
@@ -21,6 +21,10 @@
   -
   -->
 <docs>
+### General description
+
+This component displays rich text with optional autolink or [Markdown support](https://www.markdownguide.org/basic-syntax/).
+
 ```vue
 <template>
 	<div>
@@ -29,6 +33,7 @@
 		<NcCheckboxRadioSwitch :checked.sync="useMarkdown" type="checkbox">Use Markdown</NcCheckboxRadioSwitch>
 
 		<NcRichText
+			:class="{'plain-text': !useMarkdown }"
 			:text="text" :autolink="autolink" :arguments="args"
 			:use-markdown="useMarkdown" />
 	</div>
@@ -37,11 +42,16 @@
 export default {
 	data() {
 		return {
-			text: `Hello {username}. The file {file} was added by {username}. Go visit https://nextcloud.com
+			text: `## Hello everyone 🎉
+The file {file} was added by {username}. Visit https://nextcloud.com to check it!
 
-Local IP: http://127.0.0.1/status.php should be clickable
+Some examples for markdown syntax:
+1. **bold text**
+2. _italic text_
+3. example of \`inline code\`
 
-Some examples for markdown syntax: **bold text** *italic text* \`inline code\``,
+> blockquote example
+`,
 			autolink: true,
 			useMarkdown: true,
 			args: {
@@ -60,10 +70,167 @@ Some examples for markdown syntax: **bold text** *italic text* \`inline code\``,
 <style lang="scss">
 textarea {
 	width: 100%;
-	height: 100px;
+	height: 200px;
+}
+
+.plain-text {
+	white-space: pre-line;
 }
 </style>
 ```
+
+### Usage with NcRichContenteditable
+
+See [NcRichContenteditable](#/Components/NcRichContenteditable) documentation for more information
+
+```vue
+<template>
+	<div>
+		<NcRichContenteditable :value.sync="message"
+			:auto-complete="autoComplete"
+			:maxlength="100"
+			:user-data="userData"
+			placeholder="Try mentioning user @Test01 or inserting emoji :smile"
+			@submit="onSubmit" />
+
+		<NcCheckboxRadioSwitch :checked.sync="autolink" type="checkbox">Autolink</NcCheckboxRadioSwitch>
+		<NcCheckboxRadioSwitch :checked.sync="useMarkdown" type="checkbox">Use Markdown</NcCheckboxRadioSwitch>
+
+		<NcRichText :text="text"
+			:autolink="autolink"
+			:arguments="userMentions"
+			:use-markdown="useMarkdown" />
+	</div>
+</template>
+<script>
+	export default {
+		data() {
+			return {
+				message: '',
+				autolink: true,
+				useMarkdown: true,
+				userData: {
+					Test01: {
+						icon: 'icon-user',
+						id: 'Test01',
+						label: 'Test01',
+						source: 'users',
+						primary: true,
+					},
+					Test02: {
+						icon: 'icon-user',
+						id: 'Test02',
+						label: 'Test02',
+						source: 'users',
+						status: {
+							clearAt: null,
+							icon: '🎡',
+							message: 'Visiting London',
+							status: 'away',
+						},
+						subline: 'Visiting London',
+					},
+					'Test@User': {
+						icon: 'icon-user',
+						id: 'Test@User',
+						label: 'Test 03',
+						source: 'users',
+						status: {
+							clearAt: null,
+							icon: '🎡',
+							message: 'Having space in my name',
+							status: 'online',
+						},
+						subline: 'Visiting London',
+					},
+					'Test Offline': {
+						icon: 'icon-user',
+						id: 'Test Offline',
+						label: 'Test Offline',
+						source: 'users',
+						status: {
+							clearAt: null,
+							icon: null,
+							message: null,
+							status: 'offline',
+						},
+						subline: null,
+					},
+					'Test DND': {
+						icon: 'icon-user',
+						id: 'Test DND',
+						label: 'Test DND',
+						source: 'users',
+						status: {
+							clearAt: null,
+							icon: null,
+							message: 'Out sick',
+							status: 'dnd',
+						},
+						subline: 'Out sick',
+					},
+				},
+				userMentions: {
+					'user-1': {
+						component: 'NcUserBubble',
+						props: {
+							displayName: 'Test01',
+							user: 'Test01',
+							primary: true,
+						},
+					},
+					'user-2': {
+						component: 'NcUserBubble',
+						props: {
+							displayName: 'Test02',
+							user: 'Test02',
+						},
+					},
+					'user-3': {
+						component: 'NcUserBubble',
+						props: {
+							displayName: 'Test 03',
+							user: 'Test@User',
+						},
+					},
+					'user-4': {
+						component: 'NcUserBubble',
+						props: {
+							displayName: 'Test Offline',
+							user: 'Test Offline',
+						},
+					},
+					'user-5': {
+						component: 'NcUserBubble',
+						props: {
+							displayName: 'Test DND',
+							user: 'Test DND',
+						},
+					},
+				},
+			}
+		},
+		computed: {
+			text() {
+				return this.message
+						.replace('@Test01', '{user-1}')
+						.replace('@Test02', '{user-2}')
+						.replace('@Test@User', '{user-3}')
+						.replace('@"Test Offline"', '{user-4}')
+						.replace('@"Test DND"', '{user-5}')
+			},
+		},
+		methods: {
+			autoComplete(search, callback) {
+				callback(Object.values(this.userData))
+			},
+			onSubmit() {
+				alert(this.message)
+			}
+		}
+	}
+</script>
+```
 </docs>
 
 <script>
@@ -76,7 +243,7 @@ import markdown from 'remark-parse'
 import breaks from 'remark-breaks'
 import remark2rehype from 'remark-rehype'
 import rehype2react from 'rehype-react'
-import remarkExternalLinks from 'remark-external-links'
+import rehypeExternalLinks from 'rehype-external-links'
 
 export default {
 	name: 'NcRichText',
@@ -176,10 +343,6 @@ export default {
 					autolink: this.autolink,
 					useMarkdown: this.useMarkdown,
 				})
-				.use(remarkExternalLinks, {
-					target: '_blank',
-					rel: ['noopener noreferrer'],
-				})
 				.use(breaks)
 				.use(remark2rehype, {
 					handlers: {
@@ -190,8 +353,18 @@ export default {
 				})
 				// .use(rehypeAddClasses, this.markdownCssClasses)
 				.use(remarkPlaceholder)
+				.use(rehypeExternalLinks, {
+					target: '_blank',
+					rel: ['noopener noreferrer'],
+				})
 				.use(rehype2react, {
 					createElement: (tag, attrs, children) => {
+						// unescape special symbol "<" for simple text nodes
+						children = children?.map(child => typeof child === 'string'
+							? child.replace(/&lt;/gmi, '<')
+							: child,
+						)
+
 						if (!tag.startsWith('#')) {
 							return h(tag, attrs, children)
 						}
@@ -217,18 +390,15 @@ export default {
 					},
 					prefix: false,
 				})
-				.processSync(this.useMarkdown
-				// In order to correctly show newlines in Markdown,
-				// each newline contains a non-breaking space
-					? this.text.slice()
-						.replace(/\n>\n/g, '\n>\u00A0\n')
-						.replace(/\n{2,}/g, (match) => {
-							return '\n' + '\n\u00A0\n'.repeat(match.length - 1)
-						})
-					: this.text)
+				.processSync(this.text
+					// escape special symbol "<" to not treat text as HTML
+					.replace(/</gmi, '&lt;')
+					// unescape special symbol ">" to parse blockquotes
+					.replace(/&gt;/gmi, '>')
+				)
 				.result
 
-			return h('div', { class: 'rich-text--wrapper' }, [
+			return h('div', { class: 'rich-text--wrapper rich-text--wrapper-markdown' }, [
 				renderedMarkdown,
 				this.referenceLimit > 0
 					? h('div', { class: 'rich-text--reference-widget' }, [
@@ -239,15 +409,13 @@ export default {
 		},
 	},
 	render(h) {
-		if (!this.useMarkdown) {
-			return this.renderPlaintext(h)
-		}
-
-		return this.renderMarkdown(h)
+		return this.useMarkdown
+			? this.renderMarkdown(h)
+			: this.renderPlaintext(h)
 	},
 }
 </script>
-<style scoped>
+<style lang="scss" scoped>
 /* stylelint-disable-next-line scss/at-import-partial-extension */
 @import './richtext.scss';
 
diff --git a/src/components/NcRichText/placeholder.js b/src/components/NcRichText/placeholder.js
index f2ee5b4f91..accc69048c 100644
--- a/src/components/NcRichText/placeholder.js
+++ b/src/components/NcRichText/placeholder.js
@@ -26,10 +26,7 @@ export const remarkPlaceholder = function() {
 					})
 				})
 
-			node = u('element', { tagName: 'span' }, [
-				...placeholders,
-			])
-			parent.children[index] = node
+			parent.children.splice(index, 1, ...placeholders)
 		}
 	}
 }
diff --git a/src/components/NcRichText/richtext.scss b/src/components/NcRichText/richtext.scss
index 2d85ff4095..97c8994791 100644
--- a/src/components/NcRichText/richtext.scss
+++ b/src/components/NcRichText/richtext.scss
@@ -132,3 +132,41 @@
 		}
 	}
 }
+
+.rich-text--wrapper-markdown {
+	div > *:first-child,
+	blockquote > *:first-child{
+		margin-top: 0 !important;
+	}
+	div > *:last-child ,
+	blockquote > *:last-child {
+		margin-bottom: 0 !important;
+	}
+
+	h1, h2, h3, h4, h5, h6, p, ul, ol, blockquote, pre {
+		margin-top: 0;
+		margin-bottom: 1em;
+	}
+
+	h1, h2, h3, h4, h5, h6 {
+		font-weight: bold;
+	}
+
+	h1 {
+		font-size: 30px;
+	}
+
+	ul, ol {
+		padding-left: 15px;
+	}
+
+	ul {
+		list-style-type: disc;
+	}
+
+	blockquote {
+		padding-left: 13px;
+		border-left: 2px solid var(--color-border-dark);
+		color: var(--color-text-lighter);
+	}
+}
diff --git a/src/mixins/richEditor/index.js b/src/mixins/richEditor/index.js
index dbaeaccb3c..1502cdda0c 100644
--- a/src/mixins/richEditor/index.js
+++ b/src/mixins/richEditor/index.js
@@ -66,8 +66,8 @@ export default {
 						return Linkify(part)
 					}
 
-					// Extracting the id, nuking the " and @
-					const id = part.replace(/@|&quot;/gi, '')
+					// Extracting the id, nuking the leading @ and all "
+					const id = part.slice(1).replace(/&quot;/gi, '')
 					// Compiling template and prepend with the space we removed during the split
 					return ' ' + this.genSelectTemplate(id)
 				})
diff --git a/tests/unit/components/NcRichContenteditable/NcRichContenteditable.spec.js b/tests/unit/components/NcRichContenteditable/NcRichContenteditable.spec.js
index 78ec12de09..16e49995c8 100644
--- a/tests/unit/components/NcRichContenteditable/NcRichContenteditable.spec.js
+++ b/tests/unit/components/NcRichContenteditable/NcRichContenteditable.spec.js
@@ -118,4 +118,17 @@ describe('NcRichContenteditable', () => {
 		expect(handlers.paste).toHaveBeenCalledTimes(1)
 		expect(handlers.blur).toHaveBeenCalledTimes(1)
 	})
+
+	it('should has accessible placeholder from placeholder prop', async () => {
+		const PLACEHOLDER = 'TEST_PLACEHOLDER'
+		const { wrapper } = mountNcRichContenteditable({
+			propsData: {
+				placeholder: PLACEHOLDER,
+			},
+		})
+		// Accessible placeholder
+		expect(wrapper.attributes('aria-placeholder')).toBe(PLACEHOLDER)
+		// Used in CSS for visible placeholder
+		expect(wrapper.attributes('placeholder')).toBe(PLACEHOLDER)
+	})
 })
diff --git a/tests/unit/mixins/richEditor.spec.js b/tests/unit/mixins/richEditor.spec.js
new file mode 100644
index 0000000000..fa50ed3f5a
--- /dev/null
+++ b/tests/unit/mixins/richEditor.spec.js
@@ -0,0 +1,94 @@
+/**
+ * @copyright Copyright (c) 2023 Ferdinand Thiessen <opensource@fthiessen.de>
+ *
+ * @author Ferdinand Thiessen <opensource@fthiessen.de>
+ *
+ * @license AGPL-3.0-or-later
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+import { shallowMount } from '@vue/test-utils'
+import richEditor from '../../../src/mixins/richEditor/index.js'
+
+const TestEditor = {
+	mixins: [richEditor],
+	render: (h) => h('div'),
+}
+
+describe('richEditor.js', () => {
+	'use strict'
+
+	describe('renderContent', () => {
+		it('sanitizes the input', () => {
+			const editor = shallowMount(TestEditor, { propsData: { userData: {} } })
+			const input = 'Some <table>html</table>'
+			const output = editor.vm.renderContent(input)
+
+			expect(output).toEqual('Some &lt;table&gt;html&lt;/table&gt;')
+		})
+
+		it('converts newline to hard line breaks', () => {
+			const editor = shallowMount(TestEditor, { propsData: { userData: {} } })
+			const input = 'hard\nbreak'
+			const output = editor.vm.renderContent(input)
+
+			expect(output).toEqual('hard<br>break')
+		})
+
+		it('no duplicated ampersand (from Linkify)', () => {
+			const editor = shallowMount(TestEditor, { propsData: { userData: {} } })
+			const input = 'hello &'
+			const output = editor.vm.renderContent(input)
+
+			expect(output).toEqual('hello &amp;')
+		})
+
+		it('keeps mentions without user data', () => {
+			const editor = shallowMount(TestEditor, { propsData: { userData: {} } })
+			const input = 'hello @foobar'
+			const output = editor.vm.renderContent(input)
+
+			expect(output).toEqual('hello @foobar')
+		})
+
+		it('keeps mentions with user data', () => {
+			const editor = shallowMount(TestEditor, {
+				propsData: {
+					userData: {
+						jdoe: {
+							id: 'jdoe',
+							label: 'J. Doe',
+							source: 'users',
+							icon: 'icon-user',
+						},
+					},
+				},
+			})
+			const input = 'hello @jdoe'
+			const output = editor.vm.renderContent(input)
+
+			expect(output).toMatch(/^hello <span.+role="heading" title="J. Doe"/)
+		})
+
+		it('keep mentions with special characters', () => {
+			const editor = shallowMount(TestEditor, { propsData: { userData: {} } })
+			const input = 'hello @foo@bar - hello @"bar @ foo"'
+			const output = editor.vm.renderContent(input)
+
+			expect(output).toEqual('hello @foo@bar - hello @"bar @ foo"')
+		})
+	})
+})