1 files changed, 6 insertions, 0 deletions
diff --git a/addons/mail/static/src/models/composer/composer.js b/addons/mail/static/src/models/composer/composer.js
index 2e087a1bb72..49ed975d70e 100644
--- a/addons/mail/static/src/models/composer/composer.js
+++ b/addons/mail/static/src/models/composer/composer.js
@@ -45,6 +45,9 @@ function factory(dependencies) {
         }
 
         detectSuggestionDelimiter() {
+            if (this.textInputCursorStart !== this.textInputCursorEnd) {
+                return;
+            }
             const lastInputChar = this.textInputContent.substring(this.textInputCursorStart - 1, this.textInputCursorStart);
             const suggestionDelimiters = ['@', ':', '#', '/'];
             if (suggestionDelimiters.includes(lastInputChar) && !this.hasSuggestions) {
@@ -1043,6 +1046,9 @@ function factory(dependencies) {
         textInputCursorStart: attr({
             default: 0,
         }),
+        textInputSelectionDirection: attr({
+            default: "none",
+        }),
         thread: one2one('mail.thread', {
             inverse: 'composer',
         }),