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 3b3cb1052..700fa08ce 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
@@ -152,7 +152,7 @@ class EmailReply extends App.Controller
       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)
+      quote_header = App.i18n.translateInline('On %s, %s wrote:', date, name)
       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
diff --git a/test/browser/agent_ticket_email_reply_keep_body_test.rb b/test/browser/agent_ticket_email_reply_keep_body_test.rb
index f5fe70707..51a91a6a2 100644
--- a/test/browser/agent_ticket_email_reply_keep_body_test.rb
+++ b/test/browser/agent_ticket_email_reply_keep_body_test.rb
@@ -125,7 +125,7 @@ class AgentTicketEmailReplyKeepBodyTest < TestCase
 
     full_text = @browser.find_element(css: '.content.active .article-new .articleNewEdit-body').text
 
-    match = full_text.match(/\nOn (.*?) Nicole Braun <nicole\.braun@zammad\.org> wrote:/)
+    match = full_text.match(/\nOn (.*?) Nicole Braun wrote:/)
     assert match
     assert match[1]
     assert Time.zone.parse(match[1])
diff --git a/test/unit/email_parser_test.rb b/test/unit/email_parser_test.rb
index 3e1d0262e..2eadc448f 100644
--- a/test/unit/email_parser_test.rb
+++ b/test/unit/email_parser_test.rb
@@ -32,7 +32,11 @@ File.write('test/data/mail/mailXXX.yml', Channel::EmailParser.new.parse(File.rea
       parsed_msg = m[:parsed].slice(*expected_msg.keys)
 
       expected_msg.each do |key, value|
-        assert_equal(value, parsed_msg[key], "parsed message data does not match test/data/mail/#{m[:source]}: #{key}")
+        if value.nil?
+          assert_nil(parsed_msg[key], "parsed message data does not match test/data/mail/#{m[:source]}: #{key}")
+        else
+          assert_equal(value, parsed_msg[key], "parsed message data does not match test/data/mail/#{m[:source]}: #{key}")
+        end
       end
 
       # assert: attachments in parsed message hash match metadata in raw hash