diff --git a/src/components/NewMessageModal.vue b/src/components/NewMessageModal.vue
index dde6256ad8..a0e8a19a23 100644
--- a/src/components/NewMessageModal.vue
+++ b/src/components/NewMessageModal.vue
@@ -183,6 +183,7 @@ export default {
 			changed: false,
 			largerModal: false,
 			isLargeScreen: window.innerWidth >= 1024,
+			additionalTrapElements: [],
 			isMaximized: false,
 			recipient: {
 				name: '',
diff --git a/src/components/TextEditor.vue b/src/components/TextEditor.vue
index fbff4b46ac..d30f4cc7cc 100644
--- a/src/components/TextEditor.vue
+++ b/src/components/TextEditor.vue
@@ -199,7 +199,7 @@ export default {
 						{
 							marker: '@',
 							feed: this.getContact,
-							itemRenderer: this.customRenderer,
+							itemRenderer: (value) => this.customRenderer(value, 'contact'),
 						},
 						{
 							marker: '!',
@@ -242,7 +242,7 @@ export default {
 				return []
 			}
 			let contactResults = await autoCompleteByName(text)
-			contactResults = contactResults.filter((result) => result.email.length > 0)
+			contactResults = contactResults.filter((result) => result.email.filter((email) => email.length > 1).length > 0)
 			return contactResults
 		},