diff --git a/CHANGELOG-1.0.md b/CHANGELOG-1.0.md
index 86cda6684..a540e1142 100644
--- a/CHANGELOG-1.0.md
+++ b/CHANGELOG-1.0.md
@@ -3,7 +3,11 @@ CHANGELOG for 1.0.x
 
 This changelog references any relevant changes introduced in 1.0 minor versions.
 
-* 1.0.5 (2020-01-03)
+* 1.0.7 (2020-01-25)
+    * **Issue #277:** error when ticket is created - mail to customer not sent
+    * **Issue #240:** super admin name is not showing when set via terminal.
+    
+* 1.0.6 (2020-01-04)
     * **Issue #275:** Customer reply error when workflow set for Mail to Agent.
     * **Issue #276:** Exception occur while forwording ticket (undefined variable container).
 
diff --git a/Workflow/Actions/Ticket/MailCustomer.php b/Workflow/Actions/Ticket/MailCustomer.php
index 41bee6353..89a016b7b 100644
--- a/Workflow/Actions/Ticket/MailCustomer.php
+++ b/Workflow/Actions/Ticket/MailCustomer.php
@@ -56,6 +56,7 @@ public static function applyAction(ContainerInterface $container, $entity, $valu
 
                 // Only process attachments if required in the message body
                 // @TODO: Revist -> Maybe we should always include attachments if they are provided??
+                $attachments = [];
                 if (!empty($createdThread) && (strpos($emailTemplate->getMessage(), '{%ticket.attachments%}') !== false || strpos($emailTemplate->getMessage(), '{% ticket.attachments %}') !== false)) {
                     $attachments = array_map(function($attachment) use ($container) { 
                         return str_replace('//', '/', $container->get('kernel')->getProjectDir() . "/public" . $attachment->getPath());
@@ -65,7 +66,8 @@ public static function applyAction(ContainerInterface $container, $entity, $valu
                 $ticketPlaceholders = $container->get('email.service')->getTicketPlaceholderValues($entity);
                 $subject = $container->get('email.service')->processEmailSubject($emailTemplate->getSubject(), $ticketPlaceholders);
                 $message = $container->get('email.service')->processEmailContent($emailTemplate->getMessage(), $ticketPlaceholders);
-
+                
+                $thread = ($thread != null) ? $thread : $createdThread;
                 if (!empty($thread)) {
                     $headers = ['References' => $entity->getReferenceIds()];