diff --git a/lib/PlainTextParser.php b/lib/PlainTextParser.php
index 6987a7e9a..f7535999d 100644
--- a/lib/PlainTextParser.php
+++ b/lib/PlainTextParser.php
@@ -118,7 +118,8 @@ protected function parseUntypedParameters($message) {
 	 */
 	protected function parseUserParameters($message) {
 		return preg_replace_callback('/<user\ display\-name=\"(.*?)\">(.*?)<\/user>/', function($match) {
-			return $match[1];
+			// We don't want HTML to work, but quote signs are okay.
+			return str_replace('&quot;', '"', $match[1]);
 		}, $message);
 	}