From bc4b5e1564619dbb35d9d15c8a375dadaa13c278 Mon Sep 17 00:00:00 2001
From: rabuzarus <>
Date: Sat, 16 Apr 2016 15:37:34 +0200
Subject: [PATCH 1/2] rework autocomplete: don't show the id if contact doesn't
 have an id

---
 js/autocomplete.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/js/autocomplete.js b/js/autocomplete.js
index dfe0bb3209..51e01c6f7e 100644
--- a/js/autocomplete.js
+++ b/js/autocomplete.js
@@ -84,7 +84,12 @@ function editor_replace(item) {
 
 	// $2 ensures that prefix (@,@!) is preserved
 	var id = item.id;
-	 // 16 chars of hash should be enough. Full hash could be used if it can be done in a visually appealing way.
+
+	// 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;
+
+	// 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).
 	if(id.length > 16) 
 		id = item.id.substring(0,16);

From f83040f625730d35db81c6a50916719c4d5be4ae Mon Sep 17 00:00:00 2001
From: rabuzarus <>
Date: Sat, 16 Apr 2016 15:58:11 +0200
Subject: [PATCH 2/2] rework autocomplete: space after inserting contact
 without id

---
 js/autocomplete.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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).