From 2656ee965c283745649977e9aace18abd097f731 Mon Sep 17 00:00:00 2001
From: Billy Zhou <bz@zammad.com>
Date: Wed, 22 Aug 2018 20:26:39 +0800
Subject: [PATCH] Corrected mistake in reply creation time (article.created_at)
 and removed extra <br> from quote header formatting

---
 .../controllers/ticket_zoom/article_action/email_reply.coffee | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/assets/javascripts/app/controllers/ticket_zoom/article_action/email_reply.coffee b/app/assets/javascripts/app/controllers/ticket_zoom/article_action/email_reply.coffee
index 658fd6ab0..08b9bea8f 100644
--- a/app/assets/javascripts/app/controllers/ticket_zoom/article_action/email_reply.coffee
+++ b/app/assets/javascripts/app/controllers/ticket_zoom/article_action/email_reply.coffee
@@ -148,11 +148,11 @@ class EmailReply extends App.Controller
         selected = App.Utils.text2html(selected)
 
     if selected
-      date = @date_format(article.updated_by.created_at)
+      date = @date_format(article.created_at)
       name = article.updated_by.displayName()
       email = article.updated_by.email
       quote_header = App.i18n.translateInline('On %s, %s <%s> wrote:', date, name, email)
-      selected = "<div><br><br/></div><div><blockquote type=\'cite\'><br>#{quote_header}<br><br>#{selected}<br></blockquote></div><div><br></div>"
+      selected = "<div><br><br/></div><div><blockquote type=\'cite\'>#{quote_header}<br><br>#{selected}<br></blockquote></div><div><br></div>"
 
       # add selected text to body
       body = selected + body