1 files changed, 10 insertions, 14 deletions
diff --git a/assets/js/components/autocomplete-email.js b/assets/js/components/autocomplete-email.js
index 1babd516..4a12a2fe 100644
--- a/assets/js/components/autocomplete-email.js
+++ b/assets/js/components/autocomplete-email.js
@@ -1,25 +1,21 @@
 KB.onClick('.js-autocomplete-email', function (e) {
     var email = KB.dom(e.target).data('email');
+    var emailField = KB.find('.js-mail-form input[type="email"]');
 
-    if (email) {
-        var emailField = KB.find('.js-task-mail-form input[type="email"]');
-
-        if (emailField) {
-            emailField.attr('value', email);
-            _KB.controllers['Dropdown'].close();
-        }
+    if (email && emailField) {
+        emailField.build().value = email;
     }
+
+    _KB.controllers['Dropdown'].close();
 });
 
 KB.onClick('.js-autocomplete-subject', function (e) {
     var subject = KB.dom(e.target).data('subject');
+    var subjectField = KB.find('.js-mail-form input[name="subject"]');
 
-    if (subject) {
-        var subjectField = KB.find('.js-task-mail-form input[name="subject"]');
-
-        if (subjectField) {
-            subjectField.attr('value', subject);
-            _KB.controllers['Dropdown'].close();
-        }
+    if (subject && subjectField) {
+        subjectField.build().value = subject;
     }
+
+    _KB.controllers['Dropdown'].close();
 });