diff --git a/app/assets/javascripts/app/controllers/ticket_zoom/article_actions.coffee b/app/assets/javascripts/app/controllers/ticket_zoom/article_actions.coffee
index 1f01e188b..2083d6a8f 100644
--- a/app/assets/javascripts/app/controllers/ticket_zoom/article_actions.coffee
+++ b/app/assets/javascripts/app/controllers/ticket_zoom/article_actions.coffee
@@ -328,7 +328,8 @@ class App.TicketZoomArticleActions extends App.Controller
           articleNew.to = ticket.customer.email
 
       else
-        if article.sender.name is 'Agent'
+        user = App.User.find(article.created_by_id)
+        if article.sender.name is 'Agent' && !article.from.match(user.email)
           articleNew.to = article.to
         else
           articleNew.to = article.from