diff --git a/js/autocomplete.js b/js/autocomplete.js
index 51e01c6f7e..108447ad22 100644
--- a/js/autocomplete.js
+++ b/js/autocomplete.js
@@ -87,7 +87,7 @@ function editor_replace(item) {
 
 	// don't add the id if it is empty (the id empty eg. if there are unknow contacts in thread)
 	if(id.length < 1)
-		return '$1$2' + item.nick;
+		return '$1$2' + item.nick.replace(' ', '') + ' ';
 
 	// 16 chars of hash should be enough. Full hash could be used if it can be done in a visually appealing way.
 	// 16 chars is also the minimum length in the backend (otherwise it's interpreted as a local id).