From 06404c74eb3a0ff2996fe6601b18ef5a39678ab7 Mon Sep 17 00:00:00 2001
From: Martin Edenhofer <me@edenhofer.de>
Date: Fri, 2 Feb 2018 21:04:16 +0100
Subject: [PATCH 1/3] Fixed use of new namespace for
 App.Utils.parseAddressListLocal().

---
 app/assets/javascripts/app/lib/app_post/utils.coffee | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/assets/javascripts/app/lib/app_post/utils.coffee b/app/assets/javascripts/app/lib/app_post/utils.coffee
index 0bc5a7f97..134deb96e 100644
--- a/app/assets/javascripts/app/lib/app_post/utils.coffee
+++ b/app/assets/javascripts/app/lib/app_post/utils.coffee
@@ -964,8 +964,8 @@ class App.Utils
         senders = App.Utils.parseAddressListLocal(article.from)
         if senders
           for sender in senders
-            if sender && sender.address && sender.address.match('@')
-              senderIsLocal = isLocalAddress(sender.address)
+            if sender && sender.match('@')
+              senderIsLocal = isLocalAddress(sender)
 
       # check if article recipient is local
       recipientIsLocal = false

From 5b651076198c0e48fec94d1ab134297502270a9b Mon Sep 17 00:00:00 2001
From: Martin Edenhofer <me@edenhofer.de>
Date: Fri, 2 Feb 2018 21:05:16 +0100
Subject: [PATCH 2/3] Removed platform list.

---
 README.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index e2f8578ce..030acd785 100644
--- a/README.md
+++ b/README.md
@@ -3,9 +3,9 @@
 Zammad is a web based open source helpdesk/customer support system with many
 features to manage customer communication via several channels like telephone,
 facebook, twitter, chat and e-mails. It is distributed under the GNU AFFERO
-General Public License (AGPL) and tested on Linux, Solaris, AIX, FreeBSD,
-OpenBSD and Mac OS 10.x. Do you receive many e-mails and want to answer them
-with a team of agents?
+General Public License (AGPL).
+
+Do you receive many e-mails and want to answer them with a team of agents?
 
 You're going to love Zammad!
 

From 9cc1c471a30a8cd68102b10e88eb03ccb864eb8d Mon Sep 17 00:00:00 2001
From: Martin Edenhofer <me@edenhofer.de>
Date: Fri, 2 Feb 2018 21:06:55 +0100
Subject: [PATCH 3/3] Small code improvement for lookup of existing customer.

---
 app/controllers/tickets_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/tickets_controller.rb b/app/controllers/tickets_controller.rb
index 9b2414be3..d1a41d34c 100644
--- a/app/controllers/tickets_controller.rb
+++ b/app/controllers/tickets_controller.rb
@@ -124,7 +124,7 @@ class TicketsController < ApplicationController
       if !local_customer && clean_customer[:id].present?
         local_customer = User.find_by(id: clean_customer[:id])
       end
-      if clean_customer[:email].present?
+      if !local_customer && clean_customer[:email].present?
         local_customer = User.find_by(email: clean_customer[:email].downcase)
       end
       if !local_customer && clean_customer[:login].present?