1 files changed, 8 insertions, 8 deletions
diff --git a/web-ui/app/js/mail_view/ui/recipients/recipient.js b/web-ui/app/js/mail_view/ui/recipients/recipient.js
index 2985a9ab..66577f51 100644
--- a/web-ui/app/js/mail_view/ui/recipients/recipient.js
+++ b/web-ui/app/js/mail_view/ui/recipients/recipient.js
@@ -89,18 +89,18 @@ define(
         }.bind(this));
       };
 
-      this.editRecipient = function(evt) {
-        var mailAddr = this.$node.find('input[type=hidden]').val();
-        // TODO: refactor the code bellow
-        $('#recipients-to-area').find('input.tt-input').val(mailAddr);
-        $('#recipients-to-area').find('input.tt-input').focus();
-        this.destroy();
-        // TODO: fix the bug when edit recipient and click out of the input
+      this.getMailAddress = function() {
+        return this.$node.find('input[type=hidden]').val();
       };
 
+      this.triggerEditRecipient = function(event, element) {
+        this.trigger(this.$node.closest('.recipients-area'), events.ui.recipients.clickToEdit, this);
+      }
+
       this.after('initialize', function () {
         this.recipientDelActions();
-        this.on('click', this.editRecipient);
+        this.on('click', this.triggerEditRecipient);
+        
         if (this.attr.invalidAddress){
             this.sinalizeInvalid();
         } else {