From e5c57819537b0c7aefc3802ab33d5823c7dda6e2 Mon Sep 17 00:00:00 2001
From: Nick Mueller <nick.mueller.at@gmail.com>
Date: Fri, 17 Feb 2017 02:23:45 +0100
Subject: [PATCH 1/2] Added quotes around "From" name to prevent F3 email
 parsing issues (fixes #438)

---
 app/main/controller/mailcontroller.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/main/controller/mailcontroller.php b/app/main/controller/mailcontroller.php
index d34ef8f8..7ba344eb 100644
--- a/app/main/controller/mailcontroller.php
+++ b/app/main/controller/mailcontroller.php
@@ -50,7 +50,7 @@ class MailController extends \SMTP{
      */
     public function sendRallyPoint($to, $msg){
         $this->set('To', '<' . $to . '>');
-        $this->set('From', 'Pathfinder <' . Controller::getEnvironmentData('SMTP_FROM') . '>');
+        $this->set('From', '"Pathfinder" <' . Controller::getEnvironmentData('SMTP_FROM') . '>');
         $this->set('Subject', 'PATHFINDER - New rally point');
         $status = $this->send($msg);
 

From 60632e2cab95825e94d496dc97b4a08d5bc7a48b Mon Sep 17 00:00:00 2001
From: Nick Mueller <nick.mueller.at@gmail.com>
Date: Fri, 17 Feb 2017 08:57:51 +0100
Subject: [PATCH 2/2] Added missing quotes to sendDeleteAccount as well Fixed
 missing starting chevron in "Error-To" header

---
 app/main/controller/mailcontroller.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/main/controller/mailcontroller.php b/app/main/controller/mailcontroller.php
index 7ba344eb..39eca2ab 100644
--- a/app/main/controller/mailcontroller.php
+++ b/app/main/controller/mailcontroller.php
@@ -22,7 +22,7 @@ class MailController extends \SMTP{
         parent::__construct($host,$port,$scheme,$user,$pw);
 
         // error handling
-        $this->set('Errors-to', '' . Controller::getEnvironmentData('SMTP_ERROR') . '>');
+        $this->set('Errors-to', '<' . Controller::getEnvironmentData('SMTP_ERROR') . '>');
         $this->set('MIME-Version', '1.0');
         $this->set('Content-Type', 'text/html; charset=ISO-8859-1');
     }
@@ -35,7 +35,7 @@ class MailController extends \SMTP{
      */
     public function sendDeleteAccount($to, $msg){
         $this->set('To', '<' . $to . '>');
-        $this->set('From', 'Pathfinder <' . Controller::getEnvironmentData('SMTP_FROM') . '>');
+        $this->set('From', '"Pathfinder" <' . Controller::getEnvironmentData('SMTP_FROM') . '>');
         $this->set('Subject', 'Account deleted');
         $status = $this->send($msg);